ide: remove ide_pci_enablebit_t typedef
Remove needless parens while at it. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
54cc1428cf
commit
c0ae502347
@ -471,7 +471,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
for (port = 0; port < channels; ++port) {
|
for (port = 0; port < channels; ++port) {
|
||||||
const ide_pci_enablebit_t *e = &(d->enablebits[port]);
|
const struct ide_pci_enablebit *e = &d->enablebits[port];
|
||||||
|
|
||||||
if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
|
if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
|
||||||
(tmp & e->mask) != e->val)) {
|
(tmp & e->mask) != e->val)) {
|
||||||
|
@ -1300,11 +1300,11 @@ static inline int ide_hwif_setup_dma(ide_hwif_t *hwif,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct ide_pci_enablebit_s {
|
struct ide_pci_enablebit {
|
||||||
u8 reg; /* byte pci reg holding the enable-bit */
|
u8 reg; /* byte pci reg holding the enable-bit */
|
||||||
u8 mask; /* mask to isolate the enable-bit */
|
u8 mask; /* mask to isolate the enable-bit */
|
||||||
u8 val; /* value of masked reg when "enabled" */
|
u8 val; /* value of masked reg when "enabled" */
|
||||||
} ide_pci_enablebit_t;
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
/* Uses ISA control ports not PCI ones. */
|
/* Uses ISA control ports not PCI ones. */
|
||||||
@ -1393,7 +1393,8 @@ struct ide_port_info {
|
|||||||
const struct ide_port_ops *port_ops;
|
const struct ide_port_ops *port_ops;
|
||||||
const struct ide_dma_ops *dma_ops;
|
const struct ide_dma_ops *dma_ops;
|
||||||
|
|
||||||
ide_pci_enablebit_t enablebits[2];
|
struct ide_pci_enablebit enablebits[2];
|
||||||
|
|
||||||
hwif_chipset_t chipset;
|
hwif_chipset_t chipset;
|
||||||
|
|
||||||
u16 max_sectors; /* if < than the default one */
|
u16 max_sectors; /* if < than the default one */
|
||||||
|
Loading…
Reference in New Issue
Block a user