[patch 18/28] scsi/lpfc/lpfc_init.c: remove unused variable

[patch 18/28] scsi/lpfc/lpfc_init.c: remove unused variable

[akpm]

From: Adrian Bunk <bunk@stusta.de>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/lpfc/lpfc_init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/scsi/lpfc/lpfc_init.c~scsi-lpfc-lpfc_initc-remove-unused-variable drivers/scsi/lpfc/lpfc_init.c
--- a/drivers/scsi/lpfc/lpfc_init.c~scsi-lpfc-lpfc_initc-remove-unused-variable
+++ a/drivers/scsi/lpfc/lpfc_init.c
@@ -1512,7 +1512,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev,
 	struct lpfc_sli  *psli;
 	struct lpfc_iocbq *iocbq_entry = NULL, *iocbq_next = NULL;
 	unsigned long bar0map_len, bar2map_len;
-	int error = -ENODEV, retval;
+	int error = -ENODEV;
 	int i;
 	uint16_t iotag;
 
_

Re: [patch 18/28] scsi/lpfc/lpfc_init.c: remove unused variable

[James Smart]

ACK

-- james s

akpm@linux-foundation.org wrote:
> From: Adrian Bunk <bunk@stusta.de>
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/scsi/lpfc/lpfc_init.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN drivers/scsi/lpfc/lpfc_init.c~scsi-lpfc-lpfc_initc-remove-unused-variable drivers/scsi/lpfc/lpfc_init.c
> --- a/drivers/scsi/lpfc/lpfc_init.c~scsi-lpfc-lpfc_initc-remove-unused-variable
> +++ a/drivers/scsi/lpfc/lpfc_init.c
> @@ -1512,7 +1512,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev,
>  	struct lpfc_sli  *psli;
>  	struct lpfc_iocbq *iocbq_entry = NULL, *iocbq_next = NULL;
>  	unsigned long bar0map_len, bar2map_len;
> -	int error = -ENODEV, retval;
> +	int error = -ENODEV;
>  	int i;
>  	uint16_t iotag;
>  
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [patch 18/28] scsi/lpfc/lpfc_init.c: remove unused variable

[James Bottomley]

On Thu, 2007-05-10 at 23:01 -0700, akpm@linux-foundation.org wrote:
> From: Adrian Bunk <bunk@stusta.de>
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Actually, not against vanilla linus:

drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_pci_probe_one':
drivers/scsi/lpfc/lpfc_init.c:1581: error: 'retval' undeclared (first use in this function)
drivers/scsi/lpfc/lpfc_init.c:1581: error: (Each undeclared identifier is reported only once
drivers/scsi/lpfc/lpfc_init.c:1581: error: for each function it appears in.)

There's probably some global change in -mm that makes pci_set_mwi()
return void ... in which case, this needs to be swept up into it.

James

Re: [patch 18/28] scsi/lpfc/lpfc_init.c: remove unused variable

[Andrew Morton]

On Tue, 22 May 2007 14:04:02 -0500
James Bottomley <James.Bottomley@SteelEye.com> wrote:

> On Thu, 2007-05-10 at 23:01 -0700, akpm@linux-foundation.org wrote:
> > From: Adrian Bunk <bunk@stusta.de>
> > 
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> Actually, not against vanilla linus:
> 
> drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_pci_probe_one':
> drivers/scsi/lpfc/lpfc_init.c:1581: error: 'retval' undeclared (first use in this function)
> drivers/scsi/lpfc/lpfc_init.c:1581: error: (Each undeclared identifier is reported only once
> drivers/scsi/lpfc/lpfc_init.c:1581: error: for each function it appears in.)
> 
> There's probably some global change in -mm that makes pci_set_mwi()
> return void ... in which case, this needs to be swept up into it.
> 

yep, sorry.  I rebadged this patch as being
"after Greg merges add-pci_try_set_mwi.patch"