summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/nsp32.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-06-11 01:05:01 +0200
committerJames Bottomley <jejb@titanic.(none)>2005-06-26 08:31:47 -0500
commit12413197eef2a29e0b9fb0fa541f5cbaeb1d3f3f (patch)
tree9f294101d0b9df2c49a0911b127aa99823bc0060 /drivers/scsi/nsp32.c
parent117e4b27ebb1133072b1453145e60e576569e8af (diff)
downloadlinux-12413197eef2a29e0b9fb0fa541f5cbaeb1d3f3f.tar.bz2
[SCSI] remove scsi_set_device
scsi_add_host is the proper place to set the device, but people copy the scsi_set_device usage from older drivers again and again. note that this leaves some legacy drivers like qlogicisp/qlogicfc without pci association in sysfs, but they're scheduled to go away soon anyway. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/nsp32.c')
-rw-r--r--drivers/scsi/nsp32.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 5159ceea319e..6367f009cd74 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -2719,9 +2719,7 @@ static int nsp32_detect(Scsi_Host_Template *sht)
host->unique_id = data->BaseAddress;
host->n_io_port = data->NumAddress;
host->base = (unsigned long)data->MmioAddress;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,63))
- scsi_set_device(host, &PCIDEV->dev);
-#else
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,63))
scsi_set_pci_device(host, PCIDEV);
#endif