Skip to content

L
linux
Commit fe31edc8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 175 deletions
drivers/ide/aec62xx.c
View file @ fe31edc8
...@@ -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,
}; };
......
drivers/ide/alim15x3.c
View file @ fe31edc8
...@@ -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;
......
drivers/ide/amd74xx.c
View file @ fe31edc8
...@@ -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;
......
drivers/ide/atiixp.c
View file @ fe31edc8
...@@ -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);
} }
......
drivers/ide/cmd64x.c
View file @ fe31edc8
...@@ -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;
......
drivers/ide/cs5520.c
View file @ fe31edc8
...@@ -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 };
......
drivers/ide/cs5530.c
View file @ fe31edc8
...@@ -226,7 +226,7 @@ static int init_chipset_cs5530(struct pci_dev *dev) ...@@ -226,7 +226,7 @@ static int init_chipset_cs5530(struct pci_dev *dev)
* 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);
} }
......
drivers/ide/cs5535.c
View file @ fe31edc8
...@@ -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);
} }
......
drivers/ide/cy82c693.c
View file @ fe31edc8
...@@ -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,
}; };
......
drivers/ide/delkin_cb.c
View file @ fe31edc8
...@@ -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, },
......
drivers/ide/hpt366.c
View file @ fe31edc8
...@@ -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,
}; };
......
drivers/ide/icside.c
View file @ fe31edc8
...@@ -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; void __iomem *base;
struct ide_host *host; struct ide_host *host;
...@@ -460,8 +460,8 @@ static const struct ide_port_info icside_v6_port_info __initconst = { ...@@ -460,8 +460,8 @@ static const struct ide_port_info icside_v6_port_info __initconst = {
.chipset = ide_acorn, .chipset = ide_acorn,
}; };
static int __devinit static int icside_register_v6(struct icside_state *state,
icside_register_v6(struct icside_state *state, struct expansion_card *ec) struct expansion_card *ec)
{ {
void __iomem *ioc_base, *easi_base; void __iomem *ioc_base, *easi_base;
struct ide_host *host; struct ide_host *host;
...@@ -537,8 +537,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) ...@@ -537,8 +537,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
return ret; return ret;
} }
static int __devinit static int icside_probe(struct expansion_card *ec, const struct ecard_id *id)
icside_probe(struct expansion_card *ec, const struct ecard_id *id)
{ {
struct icside_state *state; struct icside_state *state;
void __iomem *idmem; void __iomem *idmem;
...@@ -604,7 +603,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -604,7 +603,7 @@ icside_probe(struct expansion_card *ec, const struct ecard_id *id)
return ret; return ret;
} }
static void __devexit icside_remove(struct expansion_card *ec) static void icside_remove(struct expansion_card *ec)
{ {
struct icside_state *state = ecard_get_drvdata(ec); struct icside_state *state = ecard_get_drvdata(ec);
...@@ -666,7 +665,7 @@ static const struct ecard_id icside_ids[] = { ...@@ -666,7 +665,7 @@ static const struct ecard_id icside_ids[] = {
static struct ecard_driver icside_driver = { static struct ecard_driver icside_driver = {
.probe = icside_probe, .probe = icside_probe,
.remove = __devexit_p(icside_remove), .remove = icside_remove,
.shutdown = icside_shutdown, .shutdown = icside_shutdown,
.id_table = icside_ids, .id_table = icside_ids,
.drv = { .drv = {
......
drivers/ide/ide-pci-generic.c
View file @ fe31edc8
...@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = { ...@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
.udma_mask = ATA_UDMA6, \ .udma_mask = ATA_UDMA6, \
} }
static const struct ide_port_info generic_chipsets[] __devinitconst = { static const struct ide_port_info generic_chipsets[] = {
/* 0: Unknown */ /* 0: Unknown */
DECLARE_GENERIC_PCI_DEV(0), DECLARE_GENERIC_PCI_DEV(0),
...@@ -103,7 +103,7 @@ static const struct ide_port_info generic_chipsets[] __devinitconst = { ...@@ -103,7 +103,7 @@ static const struct ide_port_info generic_chipsets[] __devinitconst = {
* finds a device matching our IDE device tables. * finds a device matching our IDE device tables.
*/ */
static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
const struct ide_port_info *d = &generic_chipsets[id->driver_data]; const struct ide_port_info *d = &generic_chipsets[id->driver_data];
int ret = -ENODEV; int ret = -ENODEV;
......
drivers/ide/ide_platform.c
View file @ fe31edc8
...@@ -22,11 +22,9 @@ ...@@ -22,11 +22,9 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
static void __devinit plat_ide_setup_ports(struct ide_hw *hw, static void plat_ide_setup_ports(struct ide_hw *hw, void __iomem *base,
void __iomem *base,
void __iomem *ctrl, void __iomem *ctrl,
struct pata_platform_info *pdata, struct pata_platform_info *pdata, int irq)
int irq)
{ {
unsigned long port = (unsigned long)base; unsigned long port = (unsigned long)base;
int i; int i;
...@@ -48,7 +46,7 @@ static const struct ide_port_info platform_ide_port_info = { ...@@ -48,7 +46,7 @@ static const struct ide_port_info platform_ide_port_info = {
.chipset = ide_generic, .chipset = ide_generic,
}; };
static int __devinit plat_ide_probe(struct platform_device *pdev) static int plat_ide_probe(struct platform_device *pdev)
{ {
struct resource *res_base, *res_alt, *res_irq; struct resource *res_base, *res_alt, *res_irq;
void __iomem *base, *alt_base; void __iomem *base, *alt_base;
...@@ -115,7 +113,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) ...@@ -115,7 +113,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit plat_ide_remove(struct platform_device *pdev) static int plat_ide_remove(struct platform_device *pdev)
{ {
struct ide_host *host = dev_get_drvdata(&pdev->dev); struct ide_host *host = dev_get_drvdata(&pdev->dev);
...@@ -130,7 +128,7 @@ static struct platform_driver platform_ide_driver = { ...@@ -130,7 +128,7 @@ static struct platform_driver platform_ide_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = plat_ide_probe, .probe = plat_ide_probe,
.remove = __devexit_p(plat_ide_remove), .remove = plat_ide_remove,
}; };
static int __init platform_ide_init(void) static int __init platform_ide_init(void)
......
drivers/ide/it8172.c
View file @ fe31edc8
...@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = { ...@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
.set_dma_mode = it8172_set_dma_mode, .set_dma_mode = it8172_set_dma_mode,
}; };
static const struct ide_port_info it8172_port_info __devinitconst = { static const struct ide_port_info it8172_port_info = {
.name = DRV_NAME, .name = DRV_NAME,
.port_ops = &it8172_port_ops, .port_ops = &it8172_port_ops,
.enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} }, .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
...@@ -125,8 +125,7 @@ static const struct ide_port_info it8172_port_info __devinitconst = { ...@@ -125,8 +125,7 @@ static const struct ide_port_info it8172_port_info __devinitconst = {
.udma_mask = ATA_UDMA2, .udma_mask = ATA_UDMA2,
}; };
static int __devinit it8172_init_one(struct pci_dev *dev, static int it8172_init_one(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
return -ENODEV; /* IT8172 is more than an IDE controller */ return -ENODEV; /* IT8172 is more than an IDE controller */
......
drivers/ide/it8213.c
View file @ fe31edc8
...@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = { ...@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
.cable_detect = it8213_cable_detect, .cable_detect = it8213_cable_detect,
}; };
static const struct ide_port_info it8213_chipset __devinitconst = { static const struct ide_port_info it8213_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.enablebits = { {0x41, 0x80, 0x80} }, .enablebits = { {0x41, 0x80, 0x80} },
.port_ops = &it8213_port_ops, .port_ops = &it8213_port_ops,
...@@ -177,7 +177,7 @@ static const struct ide_port_info it8213_chipset __devinitconst = { ...@@ -177,7 +177,7 @@ static const struct ide_port_info it8213_chipset __devinitconst = {
* standard helper functions to do almost all the work for us. * standard helper functions to do almost all the work for us.
*/ */
static int __devinit it8213_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int it8213_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &it8213_chipset, NULL); return ide_pci_init_one(dev, &it8213_chipset, NULL);
} }
......
drivers/ide/it821x.c
View file @ fe31edc8
...@@ -528,7 +528,7 @@ static struct ide_dma_ops it821x_pass_through_dma_ops = { ...@@ -528,7 +528,7 @@ static struct ide_dma_ops it821x_pass_through_dma_ops = {
* ide DMA handlers appropriately * ide DMA handlers appropriately
*/ */
static void __devinit init_hwif_it821x(ide_hwif_t *hwif) static void init_hwif_it821x(ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
...@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = { ...@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
.cable_detect = it821x_cable_detect, .cable_detect = it821x_cable_detect,
}; };
static const struct ide_port_info it821x_chipset __devinitconst = { static const struct ide_port_info it821x_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_it821x, .init_chipset = init_chipset_it821x,
.init_hwif = init_hwif_it821x, .init_hwif = init_hwif_it821x,
...@@ -647,7 +647,7 @@ static const struct ide_port_info it821x_chipset __devinitconst = { ...@@ -647,7 +647,7 @@ static const struct ide_port_info it821x_chipset __devinitconst = {
* We then use the IDE PCI generic helper to do most of the work. * We then use the IDE PCI generic helper to do most of the work.
*/ */
static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int it821x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct it821x_dev *itdevs; struct it821x_dev *itdevs;
int rc; int rc;
...@@ -667,7 +667,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic ...@@ -667,7 +667,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic
return rc; return rc;
} }
static void __devexit it821x_remove(struct pci_dev *dev) static void it821x_remove(struct pci_dev *dev)
{ {
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct it821x_dev *itdevs = host->host_priv; struct it821x_dev *itdevs = host->host_priv;
...@@ -689,7 +689,7 @@ static struct pci_driver it821x_pci_driver = { ...@@ -689,7 +689,7 @@ static struct pci_driver it821x_pci_driver = {
.name = "ITE821x IDE", .name = "ITE821x IDE",
.id_table = it821x_pci_tbl, .id_table = it821x_pci_tbl,
.probe = it821x_init_one, .probe = it821x_init_one,
.remove = __devexit_p(it821x_remove), .remove = it821x_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
drivers/ide/jmicron.c
View file @ fe31edc8
...@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = { ...@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
.cable_detect = jmicron_cable_detect, .cable_detect = jmicron_cable_detect,
}; };
static const struct ide_port_info jmicron_chipset __devinitconst = { static const struct ide_port_info jmicron_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
.port_ops = &jmicron_port_ops, .port_ops = &jmicron_port_ops,
...@@ -120,7 +120,7 @@ static const struct ide_port_info jmicron_chipset __devinitconst = { ...@@ -120,7 +120,7 @@ static const struct ide_port_info jmicron_chipset __devinitconst = {
* We then use the IDE PCI generic helper to do most of the work. * We then use the IDE PCI generic helper to do most of the work.
*/ */
static int __devinit jmicron_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int jmicron_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &jmicron_chipset, NULL); return ide_pci_init_one(dev, &jmicron_chipset, NULL);
} }
......
drivers/ide/ns87415.c
View file @ fe31edc8
...@@ -96,7 +96,7 @@ static const struct ide_tp_ops superio_tp_ops = { ...@@ -96,7 +96,7 @@ static const struct ide_tp_ops superio_tp_ops = {
.output_data = ide_output_data, .output_data = ide_output_data,
}; };
static void __devinit superio_init_iops(struct hwif_s *hwif) static void superio_init_iops(struct hwif_s *hwif)
{ {
struct pci_dev *pdev = to_pci_dev(hwif->dev); struct pci_dev *pdev = to_pci_dev(hwif->dev);
u32 dma_stat; u32 dma_stat;
...@@ -201,7 +201,7 @@ static int ns87415_dma_end(ide_drive_t *drive) ...@@ -201,7 +201,7 @@ static int ns87415_dma_end(ide_drive_t *drive)
return (dma_stat & 7) != 4; return (dma_stat & 7) != 4;
} }
static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) static void init_hwif_ns87415 (ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned int ctrl, using_inta; unsigned int ctrl, using_inta;
...@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = { ...@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
.dma_sff_read_status = superio_dma_sff_read_status, .dma_sff_read_status = superio_dma_sff_read_status,
}; };
static const struct ide_port_info ns87415_chipset __devinitconst = { static const struct ide_port_info ns87415_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_hwif = init_hwif_ns87415, .init_hwif = init_hwif_ns87415,
.tp_ops = &ns87415_tp_ops, .tp_ops = &ns87415_tp_ops,
...@@ -302,7 +302,7 @@ static const struct ide_port_info ns87415_chipset __devinitconst = { ...@@ -302,7 +302,7 @@ static const struct ide_port_info ns87415_chipset __devinitconst = {
IDE_HFLAG_NO_ATAPI_DMA, IDE_HFLAG_NO_ATAPI_DMA,
}; };
static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct ide_port_info d = ns87415_chipset; struct ide_port_info d = ns87415_chipset;
......
drivers/ide/opti621.c
View file @ fe31edc8
...@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = { ...@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
.set_pio_mode = opti621_set_pio_mode, .set_pio_mode = opti621_set_pio_mode,
}; };
static const struct ide_port_info opti621_chipset __devinitconst = { static const struct ide_port_info opti621_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
.port_ops = &opti621_port_ops, .port_ops = &opti621_port_ops,
...@@ -139,7 +139,7 @@ static const struct ide_port_info opti621_chipset __devinitconst = { ...@@ -139,7 +139,7 @@ static const struct ide_port_info opti621_chipset __devinitconst = {
.pio_mask = ATA_PIO4, .pio_mask = ATA_PIO4,
}; };
static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &opti621_chipset, NULL); return ide_pci_init_one(dev, &opti621_chipset, NULL);
} }
......
drivers/ide/palm_bk3710.c
View file @ fe31edc8
...@@ -220,7 +220,7 @@ static void palm_bk3710_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) ...@@ -220,7 +220,7 @@ static void palm_bk3710_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
palm_bk3710_setpiomode(base, mate, is_slave, cycle_time, pio); palm_bk3710_setpiomode(base, mate, is_slave, cycle_time, pio);
} }
static void __devinit palm_bk3710_chipinit(void __iomem *base) static void palm_bk3710_chipinit(void __iomem *base)
{ {
/* /*
* REVISIT: the ATA reset signal needs to be managed through a * REVISIT: the ATA reset signal needs to be managed through a
...@@ -282,8 +282,7 @@ static u8 palm_bk3710_cable_detect(ide_hwif_t *hwif) ...@@ -282,8 +282,7 @@ static u8 palm_bk3710_cable_detect(ide_hwif_t *hwif)
return ATA_CBL_PATA80; return ATA_CBL_PATA80;
} }
static int __devinit palm_bk3710_init_dma(ide_hwif_t *hwif, static int palm_bk3710_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
const struct ide_port_info *d)
{ {
printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name); printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name);
...@@ -301,7 +300,7 @@ static const struct ide_port_ops palm_bk3710_ports_ops = { ...@@ -301,7 +300,7 @@ static const struct ide_port_ops palm_bk3710_ports_ops = {
.cable_detect = palm_bk3710_cable_detect, .cable_detect = palm_bk3710_cable_detect,
}; };
static struct ide_port_info __devinitdata palm_bk3710_port_info = { static struct ide_port_info palm_bk3710_port_info = {
.init_dma = palm_bk3710_init_dma, .init_dma = palm_bk3710_init_dma,
.port_ops = &palm_bk3710_ports_ops, .port_ops = &palm_bk3710_ports_ops,
.dma_ops = &sff_dma_ops, .dma_ops = &sff_dma_ops,
......
drivers/ide/pdc202xx_new.c
View file @ fe31edc8
...@@ -422,7 +422,7 @@ static int init_chipset_pdcnew(struct pci_dev *dev) ...@@ -422,7 +422,7 @@ static int init_chipset_pdcnew(struct pci_dev *dev)
return 0; return 0;
} }
static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev) static struct pci_dev *pdc20270_get_dev2(struct pci_dev *dev)
{ {
struct pci_dev *dev2; struct pci_dev *dev2;
...@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = { ...@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
.udma_mask = udma, \ .udma_mask = udma, \
} }
static const struct ide_port_info pdcnew_chipsets[] __devinitconst = { static const struct ide_port_info pdcnew_chipsets[] = {
/* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5), /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
/* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6), /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
}; };
...@@ -479,7 +479,7 @@ static const struct ide_port_info pdcnew_chipsets[] __devinitconst = { ...@@ -479,7 +479,7 @@ static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
* finds a device matching our IDE device tables. * finds a device matching our IDE device tables.
*/ */
static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int pdc202new_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
const struct ide_port_info *d = &pdcnew_chipsets[id->driver_data]; const struct ide_port_info *d = &pdcnew_chipsets[id->driver_data];
struct pci_dev *bridge = dev->bus->self; struct pci_dev *bridge = dev->bus->self;
...@@ -514,7 +514,7 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de ...@@ -514,7 +514,7 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de
return ide_pci_init_one(dev, d, NULL); return ide_pci_init_one(dev, d, NULL);
} }
static void __devexit pdc202new_remove(struct pci_dev *dev) static void pdc202new_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;
...@@ -539,7 +539,7 @@ static struct pci_driver pdc202new_pci_driver = { ...@@ -539,7 +539,7 @@ static struct pci_driver pdc202new_pci_driver = {
.name = "Promise_IDE", .name = "Promise_IDE",
.id_table = pdc202new_pci_tbl, .id_table = pdc202new_pci_tbl,
.probe = pdc202new_init_one, .probe = pdc202new_init_one,
.remove = __devexit_p(pdc202new_remove), .remove = pdc202new_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
drivers/ide/pdc202xx_old.c
View file @ fe31edc8
...@@ -211,8 +211,7 @@ static int init_chipset_pdc202xx(struct pci_dev *dev) ...@@ -211,8 +211,7 @@ static int init_chipset_pdc202xx(struct pci_dev *dev)
return 0; return 0;
} }
static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev, static void pdc202ata4_fixup_irq(struct pci_dev *dev, const char *name)
const char *name)
{ {
if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) { if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) {
u8 irq = 0, irq2 = 0; u8 irq = 0, irq2 = 0;
...@@ -270,7 +269,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = { ...@@ -270,7 +269,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
.max_sectors = sectors, \ .max_sectors = sectors, \
} }
static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = { static const struct ide_port_info pdc202xx_chipsets[] = {
{ /* 0: PDC20246 */ { /* 0: PDC20246 */
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_pdc202xx, .init_chipset = init_chipset_pdc202xx,
...@@ -297,7 +296,8 @@ static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = { ...@@ -297,7 +296,8 @@ static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
* finds a device matching our IDE device tables. * finds a device matching our IDE device tables.
*/ */
static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int pdc202xx_init_one(struct pci_dev *dev,
const struct pci_device_id *id)
{ {
const struct ide_port_info *d; const struct ide_port_info *d;
u8 idx = id->driver_data; u8 idx = id->driver_data;
......
drivers/ide/piix.c
View file @ fe31edc8
...@@ -297,7 +297,7 @@ static u8 piix_cable_detect(ide_hwif_t *hwif) ...@@ -297,7 +297,7 @@ static u8 piix_cable_detect(ide_hwif_t *hwif)
* capabilities of the hardware. * capabilities of the hardware.
*/ */
static void __devinit init_hwif_piix(ide_hwif_t *hwif) static void init_hwif_piix(ide_hwif_t *hwif)
{ {
if (!hwif->dma_base) if (!hwif->dma_base)
return; return;
...@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = { ...@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
.udma_mask = udma, \ .udma_mask = udma, \
} }
static const struct ide_port_info piix_pci_info[] __devinitconst = { static const struct ide_port_info piix_pci_info[] = {
/* 0: MPIIX */ /* 0: MPIIX */
{ /* { /*
* MPIIX actually has only a single IDE channel mapped to * MPIIX actually has only a single IDE channel mapped to
...@@ -382,7 +382,7 @@ static const struct ide_port_info piix_pci_info[] __devinitconst = { ...@@ -382,7 +382,7 @@ static const struct ide_port_info piix_pci_info[] __devinitconst = {
* finds a device matching our IDE device tables. * finds a device matching our IDE device tables.
*/ */
static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int piix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &piix_pci_info[id->driver_data], NULL); return ide_pci_init_one(dev, &piix_pci_info[id->driver_data], NULL);
} }
...@@ -394,7 +394,7 @@ static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_ ...@@ -394,7 +394,7 @@ static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_
* they are found, disable use of DMA IDE * they are found, disable use of DMA IDE
*/ */
static void __devinit piix_check_450nx(void) static void piix_check_450nx(void)
{ {
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
u16 cfg; u16 cfg;
......
drivers/ide/pmac.c
View file @ fe31edc8
...@@ -1025,8 +1025,7 @@ static const struct ide_port_info pmac_port_info = { ...@@ -1025,8 +1025,7 @@ static const struct ide_port_info pmac_port_info = {
* Setup, register & probe an IDE channel driven by this driver, this is * Setup, register & probe an IDE channel driven by this driver, this is
* called by one of the 2 probe functions (macio or PCI). * called by one of the 2 probe functions (macio or PCI).
*/ */
static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, static int pmac_ide_setup_device(pmac_ide_hwif_t *pmif, struct ide_hw *hw)
struct ide_hw *hw)
{ {
struct device_node *np = pmif->node; struct device_node *np = pmif->node;
const int *bidp; const int *bidp;
...@@ -1126,7 +1125,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ...@@ -1126,7 +1125,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif,
return rc; return rc;
} }
static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base) static void pmac_ide_init_ports(struct ide_hw *hw, unsigned long base)
{ {
int i; int i;
...@@ -1139,8 +1138,8 @@ static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base) ...@@ -1139,8 +1138,8 @@ static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base)
/* /*
* Attach to a macio probed interface * Attach to a macio probed interface
*/ */
static int __devinit static int pmac_ide_macio_attach(struct macio_dev *mdev,
pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) const struct of_device_id *match)
{ {
void __iomem *base; void __iomem *base;
unsigned long regbase; unsigned long regbase;
...@@ -1262,8 +1261,8 @@ pmac_ide_macio_resume(struct macio_dev *mdev) ...@@ -1262,8 +1261,8 @@ pmac_ide_macio_resume(struct macio_dev *mdev)
/* /*
* Attach to a PCI probed interface * Attach to a PCI probed interface
*/ */
static int __devinit static int pmac_ide_pci_attach(struct pci_dev *pdev,
pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct device_node *np; struct device_node *np;
pmac_ide_hwif_t *pmif; pmac_ide_hwif_t *pmif;
...@@ -1692,8 +1691,7 @@ static const struct ide_dma_ops pmac_dma_ops = { ...@@ -1692,8 +1691,7 @@ static const struct ide_dma_ops pmac_dma_ops = {
* Allocate the data structures needed for using DMA with an interface * Allocate the data structures needed for using DMA with an interface
* and fill the proper list of functions pointers * and fill the proper list of functions pointers
*/ */
static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, static int pmac_ide_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
const struct ide_port_info *d)
{ {
pmac_ide_hwif_t *pmif = pmac_ide_hwif_t *pmif =
(pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
......
drivers/ide/rapide.c
View file @ fe31edc8
...@@ -29,8 +29,7 @@ static void rapide_setup_ports(struct ide_hw *hw, void __iomem *base, ...@@ -29,8 +29,7 @@ static void rapide_setup_ports(struct ide_hw *hw, void __iomem *base,
hw->irq = irq; hw->irq = irq;
} }
static int __devinit static int rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
{ {
void __iomem *base; void __iomem *base;
struct ide_host *host; struct ide_host *host;
...@@ -64,7 +63,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -64,7 +63,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
return ret; return ret;
} }
static void __devexit rapide_remove(struct expansion_card *ec) static void rapide_remove(struct expansion_card *ec)
{ {
struct ide_host *host = ecard_get_drvdata(ec); struct ide_host *host = ecard_get_drvdata(ec);
...@@ -82,7 +81,7 @@ static struct ecard_id rapide_ids[] = { ...@@ -82,7 +81,7 @@ static struct ecard_id rapide_ids[] = {
static struct ecard_driver rapide_driver = { static struct ecard_driver rapide_driver = {
.probe = rapide_probe, .probe = rapide_probe,
.remove = __devexit_p(rapide_remove), .remove = rapide_remove,
.id_table = rapide_ids, .id_table = rapide_ids,
.drv = { .drv = {
.name = "rapide", .name = "rapide",
......
drivers/ide/rz1000.c
View file @ fe31edc8
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define DRV_NAME "rz1000" #define DRV_NAME "rz1000"
static int __devinit rz1000_disable_readahead(struct pci_dev *dev) static int rz1000_disable_readahead(struct pci_dev *dev)
{ {
u16 reg; u16 reg;
...@@ -38,12 +38,12 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev) ...@@ -38,12 +38,12 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
} }
} }
static const struct ide_port_info rz1000_chipset __devinitconst = { static const struct ide_port_info rz1000_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.host_flags = IDE_HFLAG_NO_DMA, .host_flags = IDE_HFLAG_NO_DMA,
}; };
static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct ide_port_info d = rz1000_chipset; struct ide_port_info d = rz1000_chipset;
int rc; int rc;
......
drivers/ide/sc1200.c
View file @ fe31edc8
...@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = { ...@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_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 sc1200_chipset __devinitconst = { static const struct ide_port_info sc1200_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.port_ops = &sc1200_port_ops, .port_ops = &sc1200_port_ops,
.dma_ops = &sc1200_dma_ops, .dma_ops = &sc1200_dma_ops,
...@@ -303,7 +303,7 @@ static const struct ide_port_info sc1200_chipset __devinitconst = { ...@@ -303,7 +303,7 @@ static const struct ide_port_info sc1200_chipset __devinitconst = {
.udma_mask = ATA_UDMA2, .udma_mask = ATA_UDMA2,
}; };
static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct sc1200_saved_state *ss = NULL; struct sc1200_saved_state *ss = NULL;
int rc; int rc;
......
drivers/ide/scc_pata.c
View file @ fe31edc8
...@@ -585,8 +585,7 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev, ...@@ -585,8 +585,7 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev,
* Perform the initial set up for this device. * Perform the initial set up for this device.
*/ */
static int __devinit init_setup_scc(struct pci_dev *dev, static int init_setup_scc(struct pci_dev *dev, const struct ide_port_info *d)
const struct ide_port_info *d)
{ {
unsigned long ctl_base; unsigned long ctl_base;
unsigned long dma_base; unsigned long dma_base;
...@@ -718,7 +717,7 @@ static void scc_output_data(ide_drive_t *drive, struct ide_cmd *cmd, ...@@ -718,7 +717,7 @@ static void scc_output_data(ide_drive_t *drive, struct ide_cmd *cmd,
* *
*/ */
static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif) static void init_mmio_iops_scc(ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct scc_ports *ports = pci_get_drvdata(dev); struct scc_ports *ports = pci_get_drvdata(dev);
...@@ -738,7 +737,7 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif) ...@@ -738,7 +737,7 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
* and then do the MMIO setup. * and then do the MMIO setup.
*/ */
static void __devinit init_iops_scc(ide_hwif_t *hwif) static void init_iops_scc(ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
...@@ -748,8 +747,7 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif) ...@@ -748,8 +747,7 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)
init_mmio_iops_scc(hwif); init_mmio_iops_scc(hwif);
} }
static int __devinit scc_init_dma(ide_hwif_t *hwif, static int scc_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
const struct ide_port_info *d)
{ {
return ide_allocate_dma_engine(hwif); return ide_allocate_dma_engine(hwif);
} }
...@@ -768,7 +766,7 @@ static u8 scc_cable_detect(ide_hwif_t *hwif) ...@@ -768,7 +766,7 @@ static u8 scc_cable_detect(ide_hwif_t *hwif)
* ide DMA handlers appropriately. * ide DMA handlers appropriately.
*/ */
static void __devinit init_hwif_scc(ide_hwif_t *hwif) static void init_hwif_scc(ide_hwif_t *hwif)
{ {
/* PTERADD */ /* PTERADD */
out_be32((void __iomem *)(hwif->dma_base + 0x018), hwif->dmatable_dma); out_be32((void __iomem *)(hwif->dma_base + 0x018), hwif->dmatable_dma);
...@@ -811,7 +809,7 @@ static const struct ide_dma_ops scc_dma_ops = { ...@@ -811,7 +809,7 @@ static const struct ide_dma_ops scc_dma_ops = {
.dma_sff_read_status = scc_dma_sff_read_status, .dma_sff_read_status = scc_dma_sff_read_status,
}; };
static const struct ide_port_info scc_chipset __devinitconst = { static const struct ide_port_info scc_chipset = {
.name = "sccIDE", .name = "sccIDE",
.init_iops = init_iops_scc, .init_iops = init_iops_scc,
.init_dma = scc_init_dma, .init_dma = scc_init_dma,
...@@ -834,7 +832,7 @@ static const struct ide_port_info scc_chipset __devinitconst = { ...@@ -834,7 +832,7 @@ static const struct ide_port_info scc_chipset __devinitconst = {
* We then use the IDE PCI generic helper to do most of the work. * We then use the IDE PCI generic helper to do most of the work.
*/ */
static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return init_setup_scc(dev, &scc_chipset); return init_setup_scc(dev, &scc_chipset);
} }
...@@ -846,7 +844,7 @@ static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_i ...@@ -846,7 +844,7 @@ static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_i
* Called by the PCI code when it removes an SCC PATA controller. * Called by the PCI code when it removes an SCC PATA controller.
*/ */
static void __devexit scc_remove(struct pci_dev *dev) static void scc_remove(struct pci_dev *dev)
{ {
struct scc_ports *ports = pci_get_drvdata(dev); struct scc_ports *ports = pci_get_drvdata(dev);
struct ide_host *host = ports->host; struct ide_host *host = ports->host;
...@@ -869,7 +867,7 @@ static struct pci_driver scc_pci_driver = { ...@@ -869,7 +867,7 @@ static struct pci_driver scc_pci_driver = {
.name = "SCC IDE", .name = "SCC IDE",
.id_table = scc_pci_tbl, .id_table = scc_pci_tbl,
.probe = scc_init_one, .probe = scc_init_one,
.remove = __devexit_p(scc_remove), .remove = scc_remove,
}; };
static int __init scc_ide_init(void) static int __init scc_ide_init(void)
......
drivers/ide/serverworks.c
View file @ fe31edc8
...@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = { ...@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
.cable_detect = svwks_cable_detect, .cable_detect = svwks_cable_detect,
}; };
static const struct ide_port_info serverworks_chipsets[] __devinitconst = { static const struct ide_port_info serverworks_chipsets[] = {
{ /* 0: OSB4 */ { /* 0: OSB4 */
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_svwks, .init_chipset = init_chipset_svwks,
...@@ -391,7 +391,7 @@ static const struct ide_port_info serverworks_chipsets[] __devinitconst = { ...@@ -391,7 +391,7 @@ static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
* finds a device matching our IDE device tables. * finds a device matching our IDE device tables.
*/ */
static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int svwks_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;
......
drivers/ide/sgiioc4.c
View file @ fe31edc8
...@@ -307,8 +307,7 @@ static u8 sgiioc4_read_status(ide_hwif_t *hwif) ...@@ -307,8 +307,7 @@ static u8 sgiioc4_read_status(ide_hwif_t *hwif)
} }
/* Creates a DMA map for the scatter-gather list entries */ /* Creates a DMA map for the scatter-gather list entries */
static int __devinit ide_dma_sgiioc4(ide_hwif_t *hwif, static int ide_dma_sgiioc4(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 dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET; unsigned long dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET;
...@@ -520,7 +519,7 @@ static const struct ide_dma_ops sgiioc4_dma_ops = { ...@@ -520,7 +519,7 @@ static const struct ide_dma_ops sgiioc4_dma_ops = {
.dma_lost_irq = sgiioc4_dma_lost_irq, .dma_lost_irq = sgiioc4_dma_lost_irq,
}; };
static const struct ide_port_info sgiioc4_port_info __devinitconst = { static const struct ide_port_info sgiioc4_port_info = {
.name = DRV_NAME, .name = DRV_NAME,
.chipset = ide_pci, .chipset = ide_pci,
.init_dma = ide_dma_sgiioc4, .init_dma = ide_dma_sgiioc4,
...@@ -532,7 +531,7 @@ static const struct ide_port_info sgiioc4_port_info __devinitconst = { ...@@ -532,7 +531,7 @@ static const struct ide_port_info sgiioc4_port_info __devinitconst = {
.mwdma_mask = ATA_MWDMA2_ONLY, .mwdma_mask = ATA_MWDMA2_ONLY,
}; };
static int __devinit sgiioc4_ide_setup_pci_device(struct pci_dev *dev) static int sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
{ {
unsigned long cmd_base, irqport; unsigned long cmd_base, irqport;
unsigned long bar0, cmd_phys_base, ctl; unsigned long bar0, cmd_phys_base, ctl;
...@@ -581,7 +580,7 @@ static int __devinit sgiioc4_ide_setup_pci_device(struct pci_dev *dev) ...@@ -581,7 +580,7 @@ static int __devinit sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
return rc; return rc;
} }
static unsigned int __devinit pci_init_sgiioc4(struct pci_dev *dev) static unsigned int pci_init_sgiioc4(struct pci_dev *dev)
{ {
int ret; int ret;
...@@ -601,7 +600,7 @@ static unsigned int __devinit pci_init_sgiioc4(struct pci_dev *dev) ...@@ -601,7 +600,7 @@ static unsigned int __devinit pci_init_sgiioc4(struct pci_dev *dev)
return ret; return ret;
} }
int __devinit ioc4_ide_attach_one(struct ioc4_driver_data *idd) int ioc4_ide_attach_one(struct ioc4_driver_data *idd)
{ {
/* /*
* PCI-RT does not bring out IDE connection. * PCI-RT does not bring out IDE connection.
...@@ -613,7 +612,7 @@ int __devinit ioc4_ide_attach_one(struct ioc4_driver_data *idd) ...@@ -613,7 +612,7 @@ int __devinit ioc4_ide_attach_one(struct ioc4_driver_data *idd)
return pci_init_sgiioc4(idd->idd_pdev); return pci_init_sgiioc4(idd->idd_pdev);
} }
static struct ioc4_submodule __devinitdata ioc4_ide_submodule = { static struct ioc4_submodule ioc4_ide_submodule = {
.is_name = "IOC4_ide", .is_name = "IOC4_ide",
.is_owner = THIS_MODULE, .is_owner = THIS_MODULE,
.is_probe = ioc4_ide_attach_one, .is_probe = ioc4_ide_attach_one,
......
drivers/ide/siimage.c
View file @ fe31edc8
...@@ -546,7 +546,7 @@ static int init_chipset_siimage(struct pci_dev *dev) ...@@ -546,7 +546,7 @@ static int init_chipset_siimage(struct pci_dev *dev)
* extended PRD tables. For better SI3112 support use the libata driver * extended PRD tables. For better SI3112 support use the libata driver
*/ */
static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif) static void init_mmio_iops_siimage(ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
...@@ -646,7 +646,7 @@ static void sil_quirkproc(ide_drive_t *drive) ...@@ -646,7 +646,7 @@ static void sil_quirkproc(ide_drive_t *drive)
* can get the iops right before using them. * can get the iops right before using them.
*/ */
static void __devinit init_iops_siimage(ide_hwif_t *hwif) static void init_iops_siimage(ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
...@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = { ...@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
.udma_mask = ATA_UDMA6, \ .udma_mask = ATA_UDMA6, \
} }
static const struct ide_port_info siimage_chipsets[] __devinitconst = { static const struct ide_port_info siimage_chipsets[] = {
/* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops), /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
/* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops) /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
}; };
...@@ -733,8 +733,7 @@ static const struct ide_port_info siimage_chipsets[] __devinitconst = { ...@@ -733,8 +733,7 @@ static const struct ide_port_info siimage_chipsets[] __devinitconst = {
* We then use the IDE PCI generic helper to do most of the work. * We then use the IDE PCI generic helper to do most of the work.
*/ */
static int __devinit siimage_init_one(struct pci_dev *dev, static int siimage_init_one(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
void __iomem *ioaddr = NULL; void __iomem *ioaddr = NULL;
resource_size_t bar5 = pci_resource_start(dev, 5); resource_size_t bar5 = pci_resource_start(dev, 5);
...@@ -790,7 +789,7 @@ static int __devinit siimage_init_one(struct pci_dev *dev, ...@@ -790,7 +789,7 @@ static int __devinit siimage_init_one(struct pci_dev *dev,
return rc; return rc;
} }
static void __devexit siimage_remove(struct pci_dev *dev) static void siimage_remove(struct pci_dev *dev)
{ {
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
void __iomem *ioaddr = host->host_priv; void __iomem *ioaddr = host->host_priv;
...@@ -822,7 +821,7 @@ static struct pci_driver siimage_pci_driver = { ...@@ -822,7 +821,7 @@ static struct pci_driver siimage_pci_driver = {
.name = "SiI_IDE", .name = "SiI_IDE",
.id_table = siimage_pci_tbl, .id_table = siimage_pci_tbl,
.probe = siimage_init_one, .probe = siimage_init_one,
.remove = __devexit_p(siimage_remove), .remove = siimage_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
drivers/ide/sis5513.c
View file @ fe31edc8
...@@ -362,7 +362,7 @@ static u8 sis_ata133_udma_filter(ide_drive_t *drive) ...@@ -362,7 +362,7 @@ static u8 sis_ata133_udma_filter(ide_drive_t *drive)
return (regdw & 0x08) ? ATA_UDMA6 : ATA_UDMA5; return (regdw & 0x08) ? ATA_UDMA6 : ATA_UDMA5;
} }
static int __devinit sis_find_family(struct pci_dev *dev) static int sis_find_family(struct pci_dev *dev)
{ {
struct pci_dev *host; struct pci_dev *host;
int i = 0; int i = 0;
...@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = { ...@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
.cable_detect = sis_cable_detect, .cable_detect = sis_cable_detect,
}; };
static const struct ide_port_info sis5513_chipset __devinitconst = { static const struct ide_port_info sis5513_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_sis5513, .init_chipset = init_chipset_sis5513,
.enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} }, .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
...@@ -572,7 +572,7 @@ static const struct ide_port_info sis5513_chipset __devinitconst = { ...@@ -572,7 +572,7 @@ static const struct ide_port_info sis5513_chipset __devinitconst = {
.mwdma_mask = ATA_MWDMA2, .mwdma_mask = ATA_MWDMA2,
}; };
static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int sis5513_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct ide_port_info d = sis5513_chipset; struct ide_port_info d = sis5513_chipset;
u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f }; u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f };
...@@ -595,7 +595,7 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi ...@@ -595,7 +595,7 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi
return ide_pci_init_one(dev, &d, NULL); return ide_pci_init_one(dev, &d, NULL);
} }
static void __devexit sis5513_remove(struct pci_dev *dev) static void sis5513_remove(struct pci_dev *dev)
{ {
ide_pci_remove(dev); ide_pci_remove(dev);
pci_disable_device(dev); pci_disable_device(dev);
...@@ -613,7 +613,7 @@ static struct pci_driver sis5513_pci_driver = { ...@@ -613,7 +613,7 @@ static struct pci_driver sis5513_pci_driver = {
.name = "SIS_IDE", .name = "SIS_IDE",
.id_table = sis5513_pci_tbl, .id_table = sis5513_pci_tbl,
.probe = sis5513_init_one, .probe = sis5513_init_one,
.remove = __devexit_p(sis5513_remove), .remove = sis5513_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
drivers/ide/sl82c105.c
View file @ fe31edc8
...@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = { ...@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_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 sl82c105_chipset __devinitconst = { static const struct ide_port_info sl82c105_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_sl82c105, .init_chipset = init_chipset_sl82c105,
.enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}}, .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
...@@ -313,7 +313,7 @@ static const struct ide_port_info sl82c105_chipset __devinitconst = { ...@@ -313,7 +313,7 @@ static const struct ide_port_info sl82c105_chipset __devinitconst = {
.mwdma_mask = ATA_MWDMA2, .mwdma_mask = ATA_MWDMA2,
}; };
static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct ide_port_info d = sl82c105_chipset; struct ide_port_info d = sl82c105_chipset;
u8 rev = sl82c105_bridge_revision(dev); u8 rev = sl82c105_bridge_revision(dev);
......
drivers/ide/slc90e66.c
View file @ fe31edc8
...@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = { ...@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
.cable_detect = slc90e66_cable_detect, .cable_detect = slc90e66_cable_detect,
}; };
static const struct ide_port_info slc90e66_chipset __devinitconst = { static const struct ide_port_info slc90e66_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} }, .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
.port_ops = &slc90e66_port_ops, .port_ops = &slc90e66_port_ops,
...@@ -142,7 +142,8 @@ static const struct ide_port_info slc90e66_chipset __devinitconst = { ...@@ -142,7 +142,8 @@ static const struct ide_port_info slc90e66_chipset __devinitconst = {
.udma_mask = ATA_UDMA4, .udma_mask = ATA_UDMA4,
}; };
static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int slc90e66_init_one(struct pci_dev *dev,
const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &slc90e66_chipset, NULL); return ide_pci_init_one(dev, &slc90e66_chipset, NULL);
} }
......
drivers/ide/tc86c001.c
View file @ fe31edc8
...@@ -144,7 +144,7 @@ static u8 tc86c001_cable_detect(ide_hwif_t *hwif) ...@@ -144,7 +144,7 @@ static u8 tc86c001_cable_detect(ide_hwif_t *hwif)
return (scr1 & 0x2000) ? ATA_CBL_PATA40 : ATA_CBL_PATA80; return (scr1 & 0x2000) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
} }
static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif) static void init_hwif_tc86c001(ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long sc_base = pci_resource_start(dev, 5); unsigned long sc_base = pci_resource_start(dev, 5);
...@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = { ...@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_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 tc86c001_chipset __devinitconst = { static const struct ide_port_info tc86c001_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_hwif = init_hwif_tc86c001, .init_hwif = init_hwif_tc86c001,
.port_ops = &tc86c001_port_ops, .port_ops = &tc86c001_port_ops,
...@@ -203,7 +203,7 @@ static const struct ide_port_info tc86c001_chipset __devinitconst = { ...@@ -203,7 +203,7 @@ static const struct ide_port_info tc86c001_chipset __devinitconst = {
.udma_mask = ATA_UDMA4, .udma_mask = ATA_UDMA4,
}; };
static int __devinit tc86c001_init_one(struct pci_dev *dev, static int tc86c001_init_one(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
int rc; int rc;
...@@ -232,7 +232,7 @@ static int __devinit tc86c001_init_one(struct pci_dev *dev, ...@@ -232,7 +232,7 @@ static int __devinit tc86c001_init_one(struct pci_dev *dev,
return rc; return rc;
} }
static void __devexit tc86c001_remove(struct pci_dev *dev) static void tc86c001_remove(struct pci_dev *dev)
{ {
ide_pci_remove(dev); ide_pci_remove(dev);
pci_release_region(dev, 5); pci_release_region(dev, 5);
...@@ -249,7 +249,7 @@ static struct pci_driver tc86c001_pci_driver = { ...@@ -249,7 +249,7 @@ static struct pci_driver tc86c001_pci_driver = {
.name = "TC86C001", .name = "TC86C001",
.id_table = tc86c001_pci_tbl, .id_table = tc86c001_pci_tbl,
.probe = tc86c001_init_one, .probe = tc86c001_init_one,
.remove = __devexit_p(tc86c001_remove), .remove = tc86c001_remove,
}; };
static int __init tc86c001_ide_init(void) static int __init tc86c001_ide_init(void)
......
drivers/ide/triflex.c
View file @ fe31edc8
...@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = { ...@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
.set_dma_mode = triflex_set_mode, .set_dma_mode = triflex_set_mode,
}; };
static const struct ide_port_info triflex_device __devinitconst = { static const struct ide_port_info triflex_device = {
.name = DRV_NAME, .name = DRV_NAME,
.enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}}, .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
.port_ops = &triflex_port_ops, .port_ops = &triflex_port_ops,
...@@ -101,8 +101,7 @@ static const struct ide_port_info triflex_device __devinitconst = { ...@@ -101,8 +101,7 @@ static const struct ide_port_info triflex_device __devinitconst = {
.mwdma_mask = ATA_MWDMA2, .mwdma_mask = ATA_MWDMA2,
}; };
static int __devinit triflex_init_one(struct pci_dev *dev, static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &triflex_device, NULL); return ide_pci_init_one(dev, &triflex_device, NULL);
} }
......
drivers/ide/trm290.c
View file @ fe31edc8
...@@ -231,7 +231,7 @@ static void trm290_dma_host_set(ide_drive_t *drive, int on) ...@@ -231,7 +231,7 @@ static void trm290_dma_host_set(ide_drive_t *drive, int on)
{ {
} }
static void __devinit init_hwif_trm290(ide_hwif_t *hwif) static void init_hwif_trm290(ide_hwif_t *hwif)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned int cfg_base = pci_resource_start(dev, 4); unsigned int cfg_base = pci_resource_start(dev, 4);
...@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = { ...@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
.dma_check = trm290_dma_check, .dma_check = trm290_dma_check,
}; };
static const struct ide_port_info trm290_chipset __devinitconst = { static const struct ide_port_info trm290_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_hwif = init_hwif_trm290, .init_hwif = init_hwif_trm290,
.tp_ops = &trm290_tp_ops, .tp_ops = &trm290_tp_ops,
...@@ -338,7 +338,7 @@ static const struct ide_port_info trm290_chipset __devinitconst = { ...@@ -338,7 +338,7 @@ static const struct ide_port_info trm290_chipset __devinitconst = {
IDE_HFLAG_NO_LBA48, IDE_HFLAG_NO_LBA48,
}; };
static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return ide_pci_init_one(dev, &trm290_chipset, NULL); return ide_pci_init_one(dev, &trm290_chipset, NULL);
} }
......
drivers/ide/via82cxxx.c
View file @ fe31edc8
...@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = { ...@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
.cable_detect = via82cxxx_cable_detect, .cable_detect = via82cxxx_cable_detect,
}; };
static const struct ide_port_info via82cxxx_chipset __devinitconst = { static const struct ide_port_info via82cxxx_chipset = {
.name = DRV_NAME, .name = DRV_NAME,
.init_chipset = init_chipset_via82cxxx, .init_chipset = init_chipset_via82cxxx,
.enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } }, .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
...@@ -416,7 +416,7 @@ static const struct ide_port_info via82cxxx_chipset __devinitconst = { ...@@ -416,7 +416,7 @@ static const struct ide_port_info via82cxxx_chipset __devinitconst = {
.mwdma_mask = ATA_MWDMA2, .mwdma_mask = ATA_MWDMA2,
}; };
static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id) static int via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct pci_dev *isa = NULL; struct pci_dev *isa = NULL;
struct via_isa_bridge *via_config; struct via_isa_bridge *via_config;
...@@ -489,7 +489,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i ...@@ -489,7 +489,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
return rc; return rc;
} }
static void __devexit via_remove(struct pci_dev *dev) static void via_remove(struct pci_dev *dev)
{ {
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct via82cxxx_dev *vdev = host->host_priv; struct via82cxxx_dev *vdev = host->host_priv;
...@@ -514,7 +514,7 @@ static struct pci_driver via_pci_driver = { ...@@ -514,7 +514,7 @@ static struct pci_driver via_pci_driver = {
.name = "VIA_IDE", .name = "VIA_IDE",
.id_table = via_pci_tbl, .id_table = via_pci_tbl,
.probe = via_init_one, .probe = via_init_one,
.remove = __devexit_p(via_remove), .remove = via_remove,
.suspend = ide_pci_suspend, .suspend = ide_pci_suspend,
.resume = ide_pci_resume, .resume = ide_pci_resume,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7