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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 36de9948
...@@ -309,7 +309,7 @@ static void __devinit palm_bk3710_chipinit(void __iomem *base) ...@@ -309,7 +309,7 @@ static void __devinit palm_bk3710_chipinit(void __iomem *base)
palm_bk3710_setpiomode(base, NULL, 1, 600, 0); palm_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; return ATA_CBL_PATA80;
} }
......
...@@ -160,7 +160,7 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev) ...@@ -160,7 +160,7 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev)
return dev->irq; return 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); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01; u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
......
...@@ -371,7 +371,7 @@ static int ali_cable_override(struct pci_dev *pdev) ...@@ -371,7 +371,7 @@ static int ali_cable_override(struct pci_dev *pdev)
* FIXME: frobs bits that are not defined on newer ALi devicea * 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); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long flags; unsigned long flags;
......
...@@ -175,7 +175,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev) ...@@ -175,7 +175,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev)
return dev->irq; return 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) if ((amd_80w >> hwif->channel) & 1)
return ATA_CBL_PATA80; return ATA_CBL_PATA80;
......
...@@ -119,7 +119,7 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -119,7 +119,7 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)
spin_unlock_irqrestore(&atiixp_lock, flags); spin_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); struct pci_dev *pdev = to_pci_dev(hwif->dev);
u8 udma_mode = 0, ch = hwif->channel; u8 udma_mode = 0, ch = hwif->channel;
......
...@@ -354,7 +354,7 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev) ...@@ -354,7 +354,7 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev)
return 0; return 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); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 bmidecsr = 0, mask = hwif->channel ? 0x02 : 0x01; u8 bmidecsr = 0, mask = hwif->channel ? 0x02 : 0x01;
......
...@@ -153,7 +153,7 @@ static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -153,7 +153,7 @@ static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio)
cs5535_set_speed(drive, XFER_PIO_0 + pio); cs5535_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); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 bit; u8 bit;
......
...@@ -1214,7 +1214,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev) ...@@ -1214,7 +1214,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)
return dev->irq; return 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 pci_dev *dev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
......
...@@ -141,7 +141,7 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -141,7 +141,7 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
} }
} }
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); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 reg42h = 0; u8 reg42h = 0;
......
...@@ -428,7 +428,7 @@ static void it821x_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -428,7 +428,7 @@ static void it821x_set_dma_mode(ide_drive_t *drive, const u8 speed)
* the needed logic onboard. * 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 */ /* The reference driver also only does disk side */
return ATA_CBL_PATA80; return ATA_CBL_PATA80;
......
...@@ -27,7 +27,7 @@ typedef enum { ...@@ -27,7 +27,7 @@ typedef enum {
* Returns the cable type. * 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); struct pci_dev *pdev = to_pci_dev(hwif->dev);
......
...@@ -193,7 +193,7 @@ static void pdcnew_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -193,7 +193,7 @@ static void pdcnew_set_pio_mode(ide_drive_t *drive, const u8 pio)
} }
} }
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) if (get_indexed_reg(hwif, 0x0b) & 0x04)
return ATA_CBL_PATA40; return ATA_CBL_PATA40;
......
...@@ -117,7 +117,7 @@ static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -117,7 +117,7 @@ static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
pdc202xx_set_mode(drive, XFER_PIO_0 + pio); pdc202xx_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); struct pci_dev *dev = to_pci_dev(hwif->dev);
u16 CIS, mask = hwif->channel ? (1 << 11) : (1 << 10); u16 CIS, mask = hwif->channel ? (1 << 11) : (1 << 10);
......
...@@ -256,7 +256,7 @@ static const struct ich_laptop ich_laptop[] = { ...@@ -256,7 +256,7 @@ static const struct ich_laptop ich_laptop[] = {
{ 0, } { 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); struct pci_dev *pdev = to_pci_dev(hwif->dev);
const struct ich_laptop *lap = &ich_laptop[0]; const struct ich_laptop *lap = &ich_laptop[0];
......
...@@ -827,7 +827,7 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif) ...@@ -827,7 +827,7 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)
init_mmio_iops_scc(hwif); 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; return ATA_CBL_PATA80;
} }
......
...@@ -272,7 +272,7 @@ static unsigned int __devinit init_chipset_svwks(struct pci_dev *dev) ...@@ -272,7 +272,7 @@ static unsigned int __devinit init_chipset_svwks(struct pci_dev *dev)
return dev->irq; return 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; return ATA_CBL_PATA80;
} }
...@@ -284,7 +284,7 @@ static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif) ...@@ -284,7 +284,7 @@ static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif)
* Bit 14 clear = primary IDE channel does not have 80-pin cable. * Bit 14 clear = primary IDE channel does not have 80-pin cable.
* Bit 14 set = primary IDE channel has 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); struct pci_dev *dev = to_pci_dev(hwif->dev);
...@@ -303,7 +303,7 @@ static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif) ...@@ -303,7 +303,7 @@ static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif)
* *
* WARNING: this only works on Alpine hardware! * 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); struct pci_dev *dev = to_pci_dev(hwif->dev);
...@@ -315,7 +315,7 @@ static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif) ...@@ -315,7 +315,7 @@ static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif)
return ATA_CBL_PATA40; return 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); struct pci_dev *dev = to_pci_dev(hwif->dev);
......
...@@ -679,7 +679,7 @@ static void __devinit init_iops_siimage(ide_hwif_t *hwif) ...@@ -679,7 +679,7 @@ static void __devinit init_iops_siimage(ide_hwif_t *hwif)
* Check for the presence of an ATA66 capable cable on the interface. * 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); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long addr = siimage_selreg(hwif, 0); unsigned long addr = siimage_selreg(hwif, 0);
......
...@@ -518,7 +518,7 @@ static const struct sis_laptop sis_laptop[] = { ...@@ -518,7 +518,7 @@ static const struct sis_laptop sis_laptop[] = {
{ 0, } { 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); struct pci_dev *pdev = to_pci_dev(hwif->dev);
const struct sis_laptop *lap = &sis_laptop[0]; const struct sis_laptop *lap = &sis_laptop[0];
......
...@@ -116,7 +116,7 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -116,7 +116,7 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
} }
} }
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); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 reg47 = 0, mask = hwif->channel ? 0x01 : 0x02; u8 reg47 = 0, mask = hwif->channel ? 0x01 : 0x02;
......
...@@ -131,7 +131,7 @@ static void tc86c001_dma_start(ide_drive_t *drive) ...@@ -131,7 +131,7 @@ static void tc86c001_dma_start(ide_drive_t *drive)
ide_dma_start(drive); ide_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); 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);
......
...@@ -352,7 +352,7 @@ static int via_cable_override(struct pci_dev *pdev) ...@@ -352,7 +352,7 @@ static int via_cable_override(struct pci_dev *pdev)
return 0; return 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 pci_dev *pdev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(pdev); struct ide_host *host = pci_get_drvdata(pdev);
......
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