diff options
author | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-14 19:47:04 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-14 19:47:04 -0400 |
commit | a57850379e389829a2fc569733b41da3d52bf366 (patch) | |
tree | 8ace66fd2d1e6f32f03b7f4f43e1821af1591a12 /drivers/scsi | |
parent | c59fd9ebc46da8d48b76955d4d48e3597f8c8726 (diff) |
[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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 350522cbf343..4a50e0a21470 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) | |||
1570 | if (error) | 1570 | if (error) |
1571 | goto out_put_shost; | 1571 | goto out_put_shost; |
1572 | 1572 | ||
1573 | if (!shost->shost_classdev.kobj.dentry) | ||
1574 | goto out_put_shost; | ||
1575 | |||
1576 | list_add_tail(&vport->listentry, &phba->port_list); | 1573 | list_add_tail(&vport->listentry, &phba->port_list); |
1577 | return vport; | 1574 | return vport; |
1578 | 1575 | ||
@@ -1720,7 +1717,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid) | |||
1720 | struct lpfc_iocbq *iocbq_entry = NULL, *iocbq_next = NULL; | 1717 | struct lpfc_iocbq *iocbq_entry = NULL, *iocbq_next = NULL; |
1721 | struct Scsi_Host *shost = NULL; | 1718 | struct Scsi_Host *shost = NULL; |
1722 | unsigned long bar0map_len, bar2map_len; | 1719 | unsigned long bar0map_len, bar2map_len; |
1723 | int error = -ENODEV, retval; | 1720 | int error = -ENODEV; |
1724 | int i; | 1721 | int i; |
1725 | uint16_t iotag; | 1722 | uint16_t iotag; |
1726 | 1723 | ||