Commit ced7172a authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

gdth section fixes 



PCI side of driver should be devinit, not init

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e669dae6

drivers/scsi/gdth.c

+6 −6
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static struct pci_driver gdth_pci_driver = { 
	.remove		= gdth_pci_remove_one,

};



static void gdth_pci_remove_one(struct pci_dev *pdev)

static void __devexit gdth_pci_remove_one(struct pci_dev *pdev)

{

	gdth_ha_str *ha = pci_get_drvdata(pdev);
@@ -600,7 +600,7 @@ static void gdth_pci_remove_one(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



static int gdth_pci_init_one(struct pci_dev *pdev,

static int __devinit gdth_pci_init_one(struct pci_dev *pdev,

				       const struct pci_device_id *ent)

{

	ushort vendor = pdev->vendor;
@@ -853,7 +853,7 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) 
#endif /* CONFIG_ISA */



#ifdef CONFIG_PCI

static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,

static int __devinit gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,

				   gdth_ha_str *ha)

{

    register gdt6_dpram_str __iomem *dp6_ptr;
@@ -1237,7 +1237,7 @@ static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr, 


/* controller protocol functions */



static void __init gdth_enable_int(gdth_ha_str *ha)

static void __devinit gdth_enable_int(gdth_ha_str *ha)

{

    ulong flags;

    gdt2_dpram_str __iomem *dp2_ptr;
@@ -1553,7 +1553,7 @@ static int gdth_internal_cmd(gdth_ha_str *ha, unchar service, ushort opcode, 


/* search for devices */



static int __init gdth_search_drives(gdth_ha_str *ha)

static int __devinit gdth_search_drives(gdth_ha_str *ha)

{

    ushort cdev_cnt, i;

    int ok;
@@ -4935,7 +4935,7 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot) 
#endif /* CONFIG_EISA */



#ifdef CONFIG_PCI

static int gdth_pci_probe_one(gdth_pci_str *pcistr,

static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr,

			     gdth_ha_str **ha_out)

{

	struct Scsi_Host *shp;