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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -362,7 +362,7 @@ static u8 sis_ata133_udma_filter(ide_drive_t *drive)
|
||||
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;
|
||||
int i = 0;
|
||||
@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
|
||||
.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,
|
||||
.init_chipset = init_chipset_sis5513,
|
||||
.enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
|
||||
@@ -572,7 +572,7 @@ static const struct ide_port_info sis5513_chipset __devinitconst = {
|
||||
.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;
|
||||
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
|
||||
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);
|
||||
pci_disable_device(dev);
|
||||
@@ -613,7 +613,7 @@ static struct pci_driver sis5513_pci_driver = {
|
||||
.name = "SIS_IDE",
|
||||
.id_table = sis5513_pci_tbl,
|
||||
.probe = sis5513_init_one,
|
||||
.remove = __devexit_p(sis5513_remove),
|
||||
.remove = sis5513_remove,
|
||||
.suspend = ide_pci_suspend,
|
||||
.resume = ide_pci_resume,
|
||||
};
|
||||
|
Reference in New Issue
Block a user