diff options
Diffstat (limited to 'drivers/ide/sis5513.c')
| -rw-r--r-- | drivers/ide/sis5513.c | 14 | 
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c index db7f4e761db..247853ea136 100644 --- a/drivers/ide/sis5513.c +++ b/drivers/ide/sis5513.c @@ -53,7 +53,7 @@  #define DRV_NAME "sis5513" -/* registers layout and init values are chipset family dependant */ +/* registers layout and init values are chipset family dependent */  #define ATA_16		0x01  #define ATA_33		0x02 @@ -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; @@ -406,7 +406,7 @@ static int __devinit sis_find_family(struct pci_dev *dev)  					pci_name(dev));  				chipset_family = ATA_133; -				/* Check for 5513 compability mapping +				/* Check for 5513 compatibility mapping  				 * We must use this, else the port enabled code will fail,  				 * as it expects the enablebits at 0x4a.  				 */ @@ -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 __devinitdata = { +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 __devinitdata = {  	.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,  };  | 
