Commit fe31edc8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Drivers: ide: remove __dev* attributes.

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ec24914
...@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = { ...@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
.cable_detect = atp86x_cable_detect, .cable_detect = atp86x_cable_detect,
}; };
static const struct ide_port_info aec62xx_chipsets[] __devinitconst = { static const struct ide_port_info aec62xx_chipsets[] = {
{ /* 0: AEC6210 */ { /* 0: AEC6210 */
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_aec62xx, .init_chipset = init_chipset_aec62xx,
...@@ -251,7 +251,7 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitconst = { ...@@ -251,7 +251,7 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
* chips, pass a local copy of 'struct ide_port_info' down the call chain. * chips, pass a local copy of 'struct ide_port_info' down the call chain.
*/ */
static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
const struct chipset_bus_clock_list_entry *bus_clock; const struct chipset_bus_clock_list_entry *bus_clock;
struct ide_port_info d; struct ide_port_info d;
...@@ -287,7 +287,7 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi ...@@ -287,7 +287,7 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi
return err; return err;
} }
static void __devexit aec62xx_remove(struct pci_dev *dev) static void aec62xx_remove(struct pci_dev *dev)
{ {
ide_pci_remove(dev); ide_pci_remove(dev);
pci_disable_device(dev); pci_disable_device(dev);
...@@ -307,7 +307,7 @@ static struct pci_driver aec62xx_pci_driver = { ...@@ -307,7 +307,7 @@ static struct pci_driver aec62xx_pci_driver = {
.name = "AEC62xx_IDE", .name = "AEC62xx_IDE",
.id_table = aec62xx_pci_tbl, .id_table = aec62xx_pci_tbl,
.probe = aec62xx_init_one, .probe = aec62xx_init_one,
.remove = __devexit_p(aec62xx_remove), .remove = aec62xx_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
...@@ -415,7 +415,7 @@ static u8 ali_cable_detect(ide_hwif_t *hwif) ...@@ -415,7 +415,7 @@ static u8 ali_cable_detect(ide_hwif_t *hwif)
* Sparc systems. * Sparc systems.
*/ */
static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) static void init_hwif_ali15x3(ide_hwif_t *hwif)
{ {
u8 ideic, inmir; u8 ideic, inmir;
s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6, s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6,
...@@ -464,8 +464,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) ...@@ -464,8 +464,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
* Set up the DMA functionality on the ALi 15x3. * Set up the DMA functionality on the ALi 15x3.
*/ */
static int __devinit init_dma_ali15x3(ide_hwif_t *hwif, static int init_dma_ali15x3(ide_hwif_t *hwif, const struct ide_port_info *d)
const struct ide_port_info *d)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long base = ide_pci_dma_base(hwif, d); unsigned long base = ide_pci_dma_base(hwif, d);
...@@ -512,7 +511,7 @@ static const struct ide_dma_ops ali_dma_ops = { ...@@ -512,7 +511,7 @@ static const struct ide_dma_ops ali_dma_ops = {
.dma_sff_read_status = ide_dma_sff_read_status, .dma_sff_read_status = ide_dma_sff_read_status,
}; };
static const struct ide_port_info ali15x3_chipset __devinitconst = { static const struct ide_port_info ali15x3_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_ali15x3, .init_chipset = init_chipset_ali15x3,
.init_hwif = init_hwif_ali15x3, .init_hwif = init_hwif_ali15x3,
...@@ -532,7 +531,8 @@ static const struct ide_port_info ali15x3_chipset __devinitconst = { ...@@ -532,7 +531,8 @@ static const struct ide_port_info ali15x3_chipset __devinitconst = {
* hot plug layer. * hot plug layer.
*/ */
static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int alim15x3_init_one(struct pci_dev *dev,
const struct pci_device_id *id)
{ {
struct ide_port_info d = ali15x3_chipset; struct ide_port_info d = ali15x3_chipset;
u8 rev = dev->revision, idx = id->driver_data; u8 rev = dev->revision, idx = id->driver_data;
......
...@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = { ...@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
.udma_mask = udma, \ .udma_mask = udma, \
} }
static const struct ide_port_info amd74xx_chipsets[] __devinitconst = { static const struct ide_port_info amd74xx_chipsets[] = {
/* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2), /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
/* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4), /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
/* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5), /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
...@@ -235,7 +235,7 @@ static const struct ide_port_info amd74xx_chipsets[] __devinitconst = { ...@@ -235,7 +235,7 @@ static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
/* 6: AMD5536 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5), /* 6: AMD5536 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
}; };
static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id) static int amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct ide_port_info d; struct ide_port_info d;
u8 idx = id->driver_data; u8 idx = id->driver_data;
......
...@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = { ...@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
.cable_detect = atiixp_cable_detect, .cable_detect = atiixp_cable_detect,
}; };
static const struct ide_port_info atiixp_pci_info[] __devinitconst = { static const struct ide_port_info atiixp_pci_info[] = {
{ /* 0: IXP200/300/400/700 */ { /* 0: IXP200/300/400/700 */
.name = DRV_NAME, .name = DRV_NAME,
.enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
...@@ -168,7 +168,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitconst = { ...@@ -168,7 +168,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
* finds a device matching our IDE device tables. * finds a device matching our IDE device tables.
*/ */
static int __devinit atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &atiixp_pci_info[id->driver_data], NULL); return ide_pci_init_one(dev, &atiixp_pci_info[id->driver_data], NULL);
} }
......
...@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { ...@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
.dma_sff_read_status = ide_dma_sff_read_status, .dma_sff_read_status = ide_dma_sff_read_status,
}; };
static const struct ide_port_info cmd64x_chipsets[] __devinitconst = { static const struct ide_port_info cmd64x_chipsets[] = {
{ /* 0: CMD643 */ { /* 0: CMD643 */
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_cmd64x, .init_chipset = init_chipset_cmd64x,
...@@ -373,7 +373,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitconst = { ...@@ -373,7 +373,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
} }
}; };
static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct ide_port_info d; struct ide_port_info d;
u8 idx = id->driver_data; u8 idx = id->driver_data;
......
...@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = { ...@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
.set_dma_mode = cs5520_set_dma_mode, .set_dma_mode = cs5520_set_dma_mode,
}; };
static const struct ide_port_info cyrix_chipset __devinitconst = { static const struct ide_port_info cyrix_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } }, .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
.port_ops = &cs5520_port_ops, .port_ops = &cs5520_port_ops,
...@@ -108,7 +108,7 @@ static const struct ide_port_info cyrix_chipset __devinitconst = { ...@@ -108,7 +108,7 @@ static const struct ide_port_info cyrix_chipset __devinitconst = {
* work longhand. * work longhand.
*/ */
static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
const struct ide_port_info *d = &cyrix_chipset; const struct ide_port_info *d = &cyrix_chipset;
struct ide_hw hw[2], *hws[] = { NULL, NULL }; struct ide_hw hw[2], *hws[] = { NULL, NULL };
......
...@@ -226,7 +226,7 @@ out: ...@@ -226,7 +226,7 @@ out:
* performs channel-specific pre-initialization before drive probing. * performs channel-specific pre-initialization before drive probing.
*/ */
static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif) static void init_hwif_cs5530 (ide_hwif_t *hwif)
{ {
unsigned long basereg; unsigned long basereg;
u32 d0_timings; u32 d0_timings;
...@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = { ...@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
.udma_filter = cs5530_udma_filter, .udma_filter = cs5530_udma_filter,
}; };
static const struct ide_port_info cs5530_chipset __devinitconst = { static const struct ide_port_info cs5530_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_cs5530, .init_chipset = init_chipset_cs5530,
.init_hwif = init_hwif_cs5530, .init_hwif = init_hwif_cs5530,
...@@ -257,7 +257,7 @@ static const struct ide_port_info cs5530_chipset __devinitconst = { ...@@ -257,7 +257,7 @@ static const struct ide_port_info cs5530_chipset __devinitconst = {
.udma_mask = ATA_UDMA2, .udma_mask = ATA_UDMA2,
}; };
static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &cs5530_chipset, NULL); return ide_pci_init_one(dev, &cs5530_chipset, NULL);
} }
......
...@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = { ...@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
.cable_detect = cs5535_cable_detect, .cable_detect = cs5535_cable_detect,
}; };
static const struct ide_port_info cs5535_chipset __devinitconst = { static const struct ide_port_info cs5535_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.port_ops = &cs5535_port_ops, .port_ops = &cs5535_port_ops,
.host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE, .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
...@@ -179,8 +179,7 @@ static const struct ide_port_info cs5535_chipset __devinitconst = { ...@@ -179,8 +179,7 @@ static const struct ide_port_info cs5535_chipset __devinitconst = {
.udma_mask = ATA_UDMA4, .udma_mask = ATA_UDMA4,
}; };
static int __devinit cs5535_init_one(struct pci_dev *dev, static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &cs5535_chipset, NULL); return ide_pci_init_one(dev, &cs5535_chipset, NULL);
} }
......
...@@ -145,7 +145,7 @@ static void cy82c693_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) ...@@ -145,7 +145,7 @@ static void cy82c693_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
pci_dev_put(dev); pci_dev_put(dev);
} }
static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) static void init_iops_cy82c693(ide_hwif_t *hwif)
{ {
static ide_hwif_t *primary; static ide_hwif_t *primary;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
...@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = { ...@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
.set_dma_mode = cy82c693_set_dma_mode, .set_dma_mode = cy82c693_set_dma_mode,
}; };
static const struct ide_port_info cy82c693_chipset __devinitconst = { static const struct ide_port_info cy82c693_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_iops = init_iops_cy82c693, .init_iops = init_iops_cy82c693,
.port_ops = &cy82c693_port_ops, .port_ops = &cy82c693_port_ops,
...@@ -173,7 +173,8 @@ static const struct ide_port_info cy82c693_chipset __devinitconst = { ...@@ -173,7 +173,8 @@ static const struct ide_port_info cy82c693_chipset __devinitconst = {
.mwdma_mask = ATA_MWDMA2, .mwdma_mask = ATA_MWDMA2,
}; };
static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int cy82c693_init_one(struct pci_dev *dev,
const struct pci_device_id *id)
{ {
struct pci_dev *dev2; struct pci_dev *dev2;
int ret = -ENODEV; int ret = -ENODEV;
...@@ -190,7 +191,7 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev ...@@ -190,7 +191,7 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev
return ret; return ret;
} }
static void __devexit cy82c693_remove(struct pci_dev *dev) static void cy82c693_remove(struct pci_dev *dev)
{ {
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct pci_dev *dev2 = host->dev[1] ? to_pci_dev(host->dev[1]) : NULL; struct pci_dev *dev2 = host->dev[1] ? to_pci_dev(host->dev[1]) : NULL;
...@@ -209,7 +210,7 @@ static struct pci_driver cy82c693_pci_driver = { ...@@ -209,7 +210,7 @@ static struct pci_driver cy82c693_pci_driver = {
.name = "Cypress_IDE", .name = "Cypress_IDE",
.id_table = cy82c693_pci_tbl, .id_table = cy82c693_pci_tbl,
.probe = cy82c693_init_one, .probe = cy82c693_init_one,
.remove = __devexit_p(cy82c693_remove), .remove = cy82c693_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
...@@ -71,8 +71,7 @@ static const struct ide_port_info delkin_cb_port_info = { ...@@ -71,8 +71,7 @@ static const struct ide_port_info delkin_cb_port_info = {
.chipset = ide_pci, .chipset = ide_pci,
}; };
static int __devinit static int delkin_cb_probe(struct pci_dev *dev, const struct pci_device_id *id)
delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct ide_host *host; struct ide_host *host;
unsigned long base; unsigned long base;
...@@ -158,7 +157,7 @@ static int delkin_cb_resume(struct pci_dev *dev) ...@@ -158,7 +157,7 @@ static int delkin_cb_resume(struct pci_dev *dev)
#define delkin_cb_resume NULL #define delkin_cb_resume NULL
#endif #endif
static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = { static struct pci_device_id delkin_cb_pci_tbl[] = {
{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ 0, }, { 0, },
......
...@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = { ...@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
} }
}; };
static const struct hpt_info hpt36x __devinitconst = { static const struct hpt_info hpt36x = {
.chip_name = "HPT36x", .chip_name = "HPT36x",
.chip_type = HPT36x, .chip_type = HPT36x,
.udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2, .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
...@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitconst = { ...@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitconst = {
.timings = &hpt36x_timings .timings = &hpt36x_timings
}; };
static const struct hpt_info hpt370 __devinitconst = { static const struct hpt_info hpt370 = {
.chip_name = "HPT370", .chip_name = "HPT370",
.chip_type = HPT370, .chip_type = HPT370,
.udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4, .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
...@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitconst = { ...@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt370a __devinitconst = { static const struct hpt_info hpt370a = {
.chip_name = "HPT370A", .chip_name = "HPT370A",
.chip_type = HPT370A, .chip_type = HPT370A,
.udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4, .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
...@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitconst = { ...@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt374 __devinitconst = { static const struct hpt_info hpt374 = {
.chip_name = "HPT374", .chip_name = "HPT374",
.chip_type = HPT374, .chip_type = HPT374,
.udma_mask = ATA_UDMA5, .udma_mask = ATA_UDMA5,
...@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitconst = { ...@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt372 __devinitconst = { static const struct hpt_info hpt372 = {
.chip_name = "HPT372", .chip_name = "HPT372",
.chip_type = HPT372, .chip_type = HPT372,
.udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
...@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitconst = { ...@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt372a __devinitconst = { static const struct hpt_info hpt372a = {
.chip_name = "HPT372A", .chip_name = "HPT372A",
.chip_type = HPT372A, .chip_type = HPT372A,
.udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
...@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitconst = { ...@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt302 __devinitconst = { static const struct hpt_info hpt302 = {
.chip_name = "HPT302", .chip_name = "HPT302",
.chip_type = HPT302, .chip_type = HPT302,
.udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
...@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitconst = { ...@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt371 __devinitconst = { static const struct hpt_info hpt371 = {
.chip_name = "HPT371", .chip_name = "HPT371",
.chip_type = HPT371, .chip_type = HPT371,
.udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
...@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitconst = { ...@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt372n __devinitconst = { static const struct hpt_info hpt372n = {
.chip_name = "HPT372N", .chip_name = "HPT372N",
.chip_type = HPT372N, .chip_type = HPT372N,
.udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
...@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitconst = { ...@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt302n __devinitconst = { static const struct hpt_info hpt302n = {
.chip_name = "HPT302N", .chip_name = "HPT302N",
.chip_type = HPT302N, .chip_type = HPT302N,
.udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
...@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitconst = { ...@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitconst = {
.timings = &hpt37x_timings .timings = &hpt37x_timings
}; };
static const struct hpt_info hpt371n __devinitconst = { static const struct hpt_info hpt371n = {
.chip_name = "HPT371N", .chip_name = "HPT371N",
.chip_type = HPT371N, .chip_type = HPT371N,
.udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5, .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
...@@ -1197,7 +1197,7 @@ static u8 hpt3xx_cable_detect(ide_hwif_t *hwif) ...@@ -1197,7 +1197,7 @@ static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)
return (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80; return (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
} }
static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) static void init_hwif_hpt366(ide_hwif_t *hwif)
{ {
struct hpt_info *info = hpt3xx_get_info(hwif->dev); struct hpt_info *info = hpt3xx_get_info(hwif->dev);
u8 chip_type = info->chip_type; u8 chip_type = info->chip_type;
...@@ -1221,7 +1221,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) ...@@ -1221,7 +1221,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
} }
} }
static int __devinit init_dma_hpt366(ide_hwif_t *hwif, static int init_dma_hpt366(ide_hwif_t *hwif,
const struct ide_port_info *d) const struct ide_port_info *d)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
...@@ -1265,7 +1265,7 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif, ...@@ -1265,7 +1265,7 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif,
return 0; return 0;
} }
static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) static void hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
{ {
if (dev2->irq != dev->irq) { if (dev2->irq != dev->irq) {
/* FIXME: we need a core pci_set_interrupt() */ /* FIXME: we need a core pci_set_interrupt() */
...@@ -1275,7 +1275,7 @@ static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) ...@@ -1275,7 +1275,7 @@ static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
} }
} }
static void __devinit hpt371_init(struct pci_dev *dev) static void hpt371_init(struct pci_dev *dev)
{ {
u8 mcr1 = 0; u8 mcr1 = 0;
...@@ -1290,7 +1290,7 @@ static void __devinit hpt371_init(struct pci_dev *dev) ...@@ -1290,7 +1290,7 @@ static void __devinit hpt371_init(struct pci_dev *dev)
pci_write_config_byte(dev, 0x50, mcr1 & ~0x04); pci_write_config_byte(dev, 0x50, mcr1 & ~0x04);
} }
static int __devinit hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2) static int hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2)
{ {
u8 mcr1 = 0, pin1 = 0, pin2 = 0; u8 mcr1 = 0, pin1 = 0, pin2 = 0;
...@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = { ...@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
.dma_sff_read_status = ide_dma_sff_read_status, .dma_sff_read_status = ide_dma_sff_read_status,
}; };
static const struct ide_port_info hpt366_chipsets[] __devinitconst = { static const struct ide_port_info hpt366_chipsets[] = {
{ /* 0: HPT36x */ { /* 0: HPT36x */
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_hpt366, .init_chipset = init_chipset_hpt366,
...@@ -1402,7 +1402,7 @@ static const struct ide_port_info hpt366_chipsets[] __devinitconst = { ...@@ -1402,7 +1402,7 @@ static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
* Called when the PCI registration layer (or the IDE initialization) * Called when the PCI registration layer (or the IDE initialization)
* finds a device matching our IDE device tables. * finds a device matching our IDE device tables.
*/ */
static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int hpt366_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
const struct hpt_info *info = NULL; const struct hpt_info *info = NULL;
struct hpt_info *dyn_info; struct hpt_info *dyn_info;
...@@ -1499,7 +1499,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic ...@@ -1499,7 +1499,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
return ret; return ret;
} }
static void __devexit hpt366_remove(struct pci_dev *dev) static void hpt366_remove(struct pci_dev *dev)
{ {
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct ide_info *info = host->host_priv; struct ide_info *info = host->host_priv;
...@@ -1510,7 +1510,7 @@ static void __devexit hpt366_remove(struct pci_dev *dev) ...@@ -1510,7 +1510,7 @@ static void __devexit hpt366_remove(struct pci_dev *dev)
kfree(info); kfree(info);
} }
static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = { static const struct pci_device_id hpt366_pci_tbl[] = {
{ PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), 0 }, { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), 0 },
{ PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT372), 1 }, { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT372), 1 },
{ PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT302), 2 }, { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT302), 2 },
...@@ -1525,7 +1525,7 @@ static struct pci_driver hpt366_pci_driver = { ...@@ -1525,7 +1525,7 @@ static struct pci_driver hpt366_pci_driver = {
.name = "HPT366_IDE", .name = "HPT366_IDE",
.id_table = hpt366_pci_tbl, .id_table = hpt366_pci_tbl,
.probe = hpt366_init_one, .probe = hpt366_init_one,
.remove = __devexit_p(hpt366_remove), .remove = hpt366_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
...@@ -406,8 +406,8 @@ static const struct ide_port_info icside_v5_port_info = { ...@@ -406,8 +406,8 @@ static const struct ide_port_info icside_v5_port_info = {
.chipset = ide_acorn, .chipset = ide_acorn,
}; };
static int __devinit static int icside_register_v5(struct icside_state *state,
icside_register_v5(struct icside_state *state, struct expansion_card *ec) struct expansion_card *ec)
{ {
void __iomem *base;