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

Commit 6f039790 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: scsi: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Adam Radford <linuxraid@lsi.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 48c68c4f

drivers/scsi/3w-9xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -2029,7 +2029,7 @@ static struct scsi_host_template driver_template = { 
};



/* This function will probe and initialize a card */

static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

{

	struct Scsi_Host *host = NULL;

	TW_Device_Extension *tw_dev;
@@ -2305,7 +2305,7 @@ static int twa_resume(struct pci_dev *pdev) 
#endif



/* PCI Devices supported by this driver */

static struct pci_device_id twa_pci_tbl[] __devinitdata = {

static struct pci_device_id twa_pci_tbl[] = {

	{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,

drivers/scsi/3w-sas.c

+2 −2
Original line number Diff line number Diff line
@@ -1604,7 +1604,7 @@ static struct scsi_host_template driver_template = { 
};



/* This function will probe and initialize a card */

static int __devinit twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

{

	struct Scsi_Host *host = NULL;

	TW_Device_Extension *tw_dev;
@@ -1893,7 +1893,7 @@ static int twl_resume(struct pci_dev *pdev) 
#endif



/* PCI Devices supported by this driver */

static struct pci_device_id twl_pci_tbl[] __devinitdata = {

static struct pci_device_id twl_pci_tbl[] = {

	{ PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9750) },

	{ }

};

drivers/scsi/3w-xxxx.c

+2 −2
Original line number Diff line number Diff line
@@ -2281,7 +2281,7 @@ static struct scsi_host_template driver_template = { 
};



/* This function will probe and initialize a card */

static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)

{

	struct Scsi_Host *host = NULL;

	TW_Device_Extension *tw_dev;
@@ -2422,7 +2422,7 @@ static void tw_remove(struct pci_dev *pdev) 
} /* End tw_remove() */



/* PCI Devices supported by this driver */

static struct pci_device_id tw_pci_tbl[] __devinitdata = {

static struct pci_device_id tw_pci_tbl[] = {

	{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_1000,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_7000,

drivers/scsi/BusLogic.c

+1 −1
Original line number Diff line number Diff line
@@ -3615,7 +3615,7 @@ static void __exit BusLogic_exit(void) 
__setup("BusLogic=", BusLogic_Setup);



#ifdef MODULE

static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = {

static struct pci_device_id BusLogic_pci_tbl[] = {

	{ PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC,

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static char *lprint_opcode(int opcode, char *pos, char *buffer, int length) 
 *	Locks: interrupts must be enabled when we are called 

 */



static int __devinit NCR5380_init(struct Scsi_Host *instance, int flags)

static int NCR5380_init(struct Scsi_Host *instance, int flags)

{

	NCR5380_local_declare();

	int i, pass;