Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f454cbe8 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static void __devinit palm_bk3710_chipinit(void __iomem *base)
	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;
}
+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev)
	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);
	u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int ali_cable_override(struct pci_dev *pdev)
 *	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;
+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev)
	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)
		return ATA_CBL_PATA80;
+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)
	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);
	u8 udma_mode = 0, ch = hwif->channel;
Loading