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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -76,7 +76,7 @@ static const char *nsp32_release_version = "1.2";
|
||||
/****************************************************************************
|
||||
* Supported hardware
|
||||
*/
|
||||
static struct pci_device_id nsp32_pci_table[] __devinitdata = {
|
||||
static struct pci_device_id nsp32_pci_table[] = {
|
||||
{
|
||||
.vendor = PCI_VENDOR_ID_IODATA,
|
||||
.device = PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II,
|
||||
@@ -186,10 +186,10 @@ static nsp32_sync_table nsp32_sync_table_pci[] = {
|
||||
* function declaration
|
||||
*/
|
||||
/* module entry point */
|
||||
static int __devinit nsp32_probe (struct pci_dev *, const struct pci_device_id *);
|
||||
static void __devexit nsp32_remove(struct pci_dev *);
|
||||
static int __init init_nsp32 (void);
|
||||
static void __exit exit_nsp32 (void);
|
||||
static int nsp32_probe (struct pci_dev *, const struct pci_device_id *);
|
||||
static void nsp32_remove(struct pci_dev *);
|
||||
static int __init init_nsp32 (void);
|
||||
static void __exit exit_nsp32 (void);
|
||||
|
||||
/* struct struct scsi_host_template */
|
||||
static int nsp32_proc_info (struct Scsi_Host *, char *, char **, off_t, int, int);
|
||||
@@ -3382,7 +3382,7 @@ static int nsp32_resume(struct pci_dev *pdev)
|
||||
/************************************************************************
|
||||
* PCI/Cardbus probe/remove routine
|
||||
*/
|
||||
static int __devinit nsp32_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
static int nsp32_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
{
|
||||
int ret;
|
||||
nsp32_hw_data *data = &nsp32_data_base;
|
||||
@@ -3418,7 +3418,7 @@ static int __devinit nsp32_probe(struct pci_dev *pdev, const struct pci_device_i
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void __devexit nsp32_remove(struct pci_dev *pdev)
|
||||
static void nsp32_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct Scsi_Host *host = pci_get_drvdata(pdev);
|
||||
|
||||
@@ -3435,7 +3435,7 @@ static struct pci_driver nsp32_driver = {
|
||||
.name = "nsp32",
|
||||
.id_table = nsp32_pci_table,
|
||||
.probe = nsp32_probe,
|
||||
.remove = __devexit_p(nsp32_remove),
|
||||
.remove = nsp32_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = nsp32_suspend,
|
||||
.resume = nsp32_resume,
|
||||
|
Reference in New Issue
Block a user