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>

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 9f1f9163a136..09f820af379d 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -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) {
-                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) ||
                     (tmp & e->mask) != e->val)) {
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 82d500c5a847..cca6cfb299bc 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1300,11 +1300,11 @@ static inline int ide_hwif_setup_dma(ide_hwif_t *hwif,
 }
 #endif
 
-typedef struct ide_pci_enablebit_s {
+struct ide_pci_enablebit {
         u8      reg;    /* byte pci reg holding the enable-bit */
         u8      mask;   /* mask to isolate the enable-bit */
         u8      val;    /* value of masked reg when "enabled" */
-} ide_pci_enablebit_t;
+};
 
 enum {
         /* 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_dma_ops        *dma_ops;
 
-        ide_pci_enablebit_t     enablebits[2];
+        struct ide_pci_enablebit        enablebits[2];
+
         hwif_chipset_t          chipset;
 
         u16                     max_sectors;    /* if < than the default one */