ide: ->cable_detect method cannot be marked __devinit
PATCH 2/2 ide: ->cable_detect method cannot be marked __devinit
Now that we have warm-plug support ->cable_detect method no longer can be be marked __devinit.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/arm/palm_bk3710.c | 2 +- drivers/ide/pci/aec62xx.c | 2 +- drivers/ide/pci/alim15x3.c | 2 +- drivers/ide/pci/amd74xx.c | 2 +- drivers/ide/pci/atiixp.c | 2 +- drivers/ide/pci/cmd64x.c | 2 +- drivers/ide/pci/cs5535.c | 2 +- drivers/ide/pci/hpt366.c | 2 +- drivers/ide/pci/it8213.c | 2 +- drivers/ide/pci/it821x.c | 2 +- drivers/ide/pci/jmicron.c | 2 +- drivers/ide/pci/pdc202xx_new.c | 2 +- drivers/ide/pci/pdc202xx_old.c | 2 +- drivers/ide/pci/piix.c | 2 +- drivers/ide/pci/scc_pata.c | 2 +- drivers/ide/pci/serverworks.c | 8 ++++---- drivers/ide/pci/siimage.c | 2 +- drivers/ide/pci/sis5513.c | 2 +- drivers/ide/pci/slc90e66.c | 2 +- drivers/ide/pci/tc86c001.c | 2 +- drivers/ide/pci/via82cxxx.c | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-)
drivers/ide/arm/palm_bk3710.c +1 -1
@@ -309,7 +309,7 @@ static void __devinit palm_bk3710_chipinpalm_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); } -static u8 __devinit palm_bk3710_cable_detect (ide_hwif_t *hwif) +static u8 palm_bk3710_cable_detect (ide_hwif_t *hwif) {return ATA_CBL_PATA80 ; }
drivers/ide/pci/aec62xx.c +1 -1
@@ -159,7 +159,7 @@ static unsigned int __devinit init_chipsreturn dev->irq; } -static u8 __devinit atp86x_cable_detect (ide_hwif_t *hwif) +static u8 atp86x_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);u8 ata66 =0 , mask = hwif->channel ?0x02 :0x01 ;
drivers/ide/pci/alim15x3.c +1 -1
@@ -370,7 +370,7 @@ static int ali_cable_override(struct pci* FIXME: frobs bits that are not defined on newer ALi devicea */ -static u8 __devinit ali_cable_detect (ide_hwif_t *hwif) +static u8 ali_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);unsigned long flags;
drivers/ide/pci/amd74xx.c +1 -1
@@ -175,7 +175,7 @@ static unsigned int __devinit init_chipsreturn dev->irq; } -static u8 __devinit amd_cable_detect (ide_hwif_t *hwif) +static u8 amd_cable_detect (ide_hwif_t *hwif) {if ((amd_80w >> hwif->channel) &1 )return ATA_CBL_PATA80 ;
drivers/ide/pci/atiixp.c +1 -1
@@ -118,7 +118,7 @@ static void atiixp_set_dma_mode(ide_drivspin_unlock_irqrestore (&atiixp_lock, flags); } -static u8 __devinit atiixp_cable_detect (ide_hwif_t *hwif) +static u8 atiixp_cable_detect (ide_hwif_t *hwif) {struct pci_dev *pdev =to_pci_dev (hwif->dev);u8 udma_mode =0 , ch = hwif->channel;
drivers/ide/pci/cmd64x.c +1 -1
@@ -353,7 +353,7 @@ static unsigned int __devinit init_chipsreturn 0 ; } -static u8 __devinit cmd64x_cable_detect (ide_hwif_t *hwif) +static u8 cmd64x_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);u8 bmidecsr =0 , mask = hwif->channel ?0x02 :0x01 ;
drivers/ide/pci/cs5535.c +1 -1
@@ -153,7 +153,7 @@ static void cs5535_set_pio_mode(ide_drivcs5535_set_speed (drive,XFER_PIO_0 + pio); } -static u8 __devinit cs5535_cable_detect (ide_hwif_t *hwif) +static u8 cs5535_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);u8 bit;
drivers/ide/pci/hpt366.c +1 -1
@@ -1213,7 +1213,7 @@ static unsigned int __devinit init_chipsreturn dev->irq; } -static u8 __devinit hpt3xx_cable_detect (ide_hwif_t *hwif) +static u8 hpt3xx_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);struct ide_host *host =pci_get_drvdata (dev);
drivers/ide/pci/it8213.c +1 -1
@@ -140,7 +140,7 @@ static void it8213_set_dma_mode(ide_driv } } -static u8 __devinit it8213_cable_detect (ide_hwif_t *hwif) +static u8 it8213_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);u8 reg42h =0 ;
drivers/ide/pci/it821x.c +1 -1
@@ -427,7 +427,7 @@ static void it821x_set_dma_mode(ide_driv* the needed logic onboard. */ -static u8 __devinit it821x_cable_detect (ide_hwif_t *hwif) +static u8 it821x_cable_detect (ide_hwif_t *hwif) {/* The reference driver also only does disk side */ return ATA_CBL_PATA80 ;
drivers/ide/pci/jmicron.c +1 -1
@@ -26,7 +26,7 @@ typedef enum {* Returns the cable type. */ -static u8 __devinit jmicron_cable_detect (ide_hwif_t *hwif) +static u8 jmicron_cable_detect (ide_hwif_t *hwif) {struct pci_dev *pdev =to_pci_dev (hwif->dev);
drivers/ide/pci/pdc202xx_new.c +1 -1
@@ -192,7 +192,7 @@ static void pdcnew_set_pio_mode(ide_driv } } -static u8 __devinit pdcnew_cable_detect (ide_hwif_t *hwif) +static u8 pdcnew_cable_detect (ide_hwif_t *hwif) {if (get_indexed_reg (hwif,0x0b ) &0x04 )return ATA_CBL_PATA40 ;
drivers/ide/pci/pdc202xx_old.c +1 -1
@@ -116,7 +116,7 @@ static void pdc202xx_set_pio_mode(ide_drpdc202xx_set_mode (drive,XFER_PIO_0 + pio); } -static u8 __devinit pdc2026x_cable_detect (ide_hwif_t *hwif) +static u8 pdc2026x_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);u16 CIS , mask = hwif->channel ? (1 <<11 ) : (1 <<10 );
drivers/ide/pci/piix.c +1 -1
@@ -255,7 +255,7 @@ static const struct ich_laptop ich_lapto { 0, } }; -static u8 __devinit piix_cable_detect (ide_hwif_t *hwif) +static u8 piix_cable_detect (ide_hwif_t *hwif) {struct pci_dev *pdev =to_pci_dev (hwif->dev);const struct ich_laptop *lap = &ich_laptop[0 ];
drivers/ide/pci/scc_pata.c +1 -1
@@ -826,7 +826,7 @@ static void __devinit init_iops_scc(ide_init_mmio_iops_scc (hwif); } -static u8 __devinit scc_cable_detect (ide_hwif_t *hwif) +static u8 scc_cable_detect (ide_hwif_t *hwif) {return ATA_CBL_PATA80 ; }
drivers/ide/pci/serverworks.c +4 -4
@@ -273,7 +273,7 @@ static unsigned int __devinit init_chipsreturn dev->irq; } -static u8 __devinit ata66_svwks_svwks (ide_hwif_t *hwif) +static u8 ata66_svwks_svwks (ide_hwif_t *hwif) {return ATA_CBL_PATA80 ; }
@@ -285,7 +285,7 @@ static u8 __devinit ata66_svwks_svwks(id* Bit 14 clear = primary IDE channel does not have 80-pin cable. * Bit 14 set = primary IDE channel has 80-pin cable. */ -static u8 __devinit ata66_svwks_dell (ide_hwif_t *hwif) +static u8 ata66_svwks_dell (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);
@@ -304,7 +304,7 @@ static u8 __devinit ata66_svwks_dell(ide* * WARNING: this only works on Alpine hardware! */ -static u8 __devinit ata66_svwks_cobalt (ide_hwif_t *hwif) +static u8 ata66_svwks_cobalt (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);
@@ -316,7 +316,7 @@ static u8 __devinit ata66_svwks_cobalt(ireturn ATA_CBL_PATA40 ; } -static u8 __devinit svwks_cable_detect (ide_hwif_t *hwif) +static u8 svwks_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);
drivers/ide/pci/siimage.c +1 -1
@@ -680,7 +680,7 @@ static void __devinit init_iops_siimage(* Check for the presence of an ATA66 capable cable on the interface. */ -static u8 __devinit sil_cable_detect (ide_hwif_t *hwif) +static u8 sil_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);unsigned long addr =siimage_selreg (hwif,0 );
drivers/ide/pci/sis5513.c +1 -1
@@ -517,7 +517,7 @@ static const struct sis_laptop sis_lapto { 0, } }; -static u8 __devinit sis_cable_detect (ide_hwif_t *hwif) +static u8 sis_cable_detect (ide_hwif_t *hwif) {struct pci_dev *pdev =to_pci_dev (hwif->dev);const struct sis_laptop *lap = &sis_laptop[0 ];
drivers/ide/pci/slc90e66.c +1 -1
@@ -115,7 +115,7 @@ static void slc90e66_set_dma_mode(ide_dr } } -static u8 __devinit slc90e66_cable_detect (ide_hwif_t *hwif) +static u8 slc90e66_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);u8 reg47 =0 , mask = hwif->channel ?0x01 :0x02 ;
drivers/ide/pci/tc86c001.c +1 -1
@@ -131,7 +131,7 @@ static void tc86c001_dma_start(ide_driveide_dma_start (drive); } -static u8 __devinit tc86c001_cable_detect (ide_hwif_t *hwif) +static u8 tc86c001_cable_detect (ide_hwif_t *hwif) {struct pci_dev *dev =to_pci_dev (hwif->dev);unsigned long sc_base =pci_resource_start (dev,5 );
drivers/ide/pci/via82cxxx.c +1 -1
@@ -352,7 +352,7 @@ static int via_cable_override(struct pcireturn 0 ; } -static u8 __devinit via82cxxx_cable_detect (ide_hwif_t *hwif) +static u8 via82cxxx_cable_detect (ide_hwif_t *hwif) {struct pci_dev *pdev =to_pci_dev (hwif->dev);struct ide_host *host =pci_get_drvdata (pdev);