]> err.no Git - linux-2.6/commitdiff
[SCSI] lpfc: Fix NPIV compile problem
authorJames Bottomley <jejb@mulgrave.localdomain>
Sat, 14 Jul 2007 23:47:04 +0000 (18:47 -0500)
committerJames Bottomley <jejb@mulgrave.localdomain>
Sat, 14 Jul 2007 23:47:04 +0000 (18:47 -0500)
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>
drivers/scsi/lpfc/lpfc_init.c

index 350522cbf34383baecc0a5051a3a7ef3b8d4bb0a..4a50e0a21470ae17ef9847d855610df449ecc473 100644 (file)
@@ -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;