summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.localdomain>2007-07-14 18:47:04 -0500
committerJames Bottomley <jejb@mulgrave.localdomain>2007-07-14 18:47:04 -0500
commita57850379e389829a2fc569733b41da3d52bf366 (patch)
tree8ace66fd2d1e6f32f03b7f4f43e1821af1591a12 /drivers/scsi
parentc59fd9ebc46da8d48b76955d4d48e3597f8c8726 (diff)
downloadop-kernel-dev-a57850379e389829a2fc569733b41da3d52bf366.zip
op-kernel-dev-a57850379e389829a2fc569733b41da3d52bf366.tar.gz
[SCSI] lpfc: Fix NPIV compile problem
drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_create_port': drivers/scsi/lpfc/lpfc_init.c:1573: error: 'struct kobject' has no member named 'dentry' Just remove the if check on this ... lpfc shouldn't be poking around in kobject structures. drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_pci_probe_one': drivers/scsi/lpfc/lpfc_init.c:1723: warning: unused variable 'retval' And remove the unused variable. Cc: James Smart <James.Smart@Emulex.Com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 350522c..4a50e0a 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1570,9 +1570,6 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct fc_vport *fc_vport)
if (error)
goto out_put_shost;
- if (!shost->shost_classdev.kobj.dentry)
- goto out_put_shost;
-
list_add_tail(&vport->listentry, &phba->port_list);
return vport;
@@ -1720,7 +1717,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
struct lpfc_iocbq *iocbq_entry = NULL, *iocbq_next = NULL;
struct Scsi_Host *shost = NULL;
unsigned long bar0map_len, bar2map_len;
- int error = -ENODEV, retval;
+ int error = -ENODEV;
int i;
uint16_t iotag;
OpenPOWER on IntegriCloud