[PATCH] mpt fusion: Cleanup some duplicate calls in mptbase.c

[PATCH] mpt fusion: Cleanup some duplicate calls in mptbase.c

[Bandan Das]

In mpt_detach, call to pci_set_drvdata is redundant because it 
has already been called in mpt_adapter_disable. In mpt_attach,
ioc->pcidev is set to pdev two times.

Signed-off-by: Bandan Das <bandan.das@stratus.com>
---
 drivers/message/fusion/mptbase.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a6a5701..2ec2fa7 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1770,7 +1770,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 	ioc->req_sz = MPT_DEFAULT_FRAME_SIZE;		/* avoid div by zero! */
 	ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
 
-	ioc->pcidev = pdev;
 
 	spin_lock_init(&ioc->taskmgmt_lock);
 	mutex_init(&ioc->internal_cmds.mutex);
@@ -2051,7 +2050,6 @@ mpt_detach(struct pci_dev *pdev)
 
 	mpt_adapter_dispose(ioc);
 
-	pci_set_drvdata(pdev, NULL);
 }
 
 /**************************************************************************
-- 
1.6.6.1

RE: [PATCH] mpt fusion: Cleanup some duplicate calls in mptbase.c

[Desai, Kashyap]

Barand, I reviewed your below patch and it is valid.

James, Can you please consider this patch as ACKed and consider it for next merge window.

Thanks, Kashyap

> -----Original Message-----
> From: Bandan Das [mailto:bandan.das@stratus.com]
> Sent: Wednesday, June 16, 2010 11:10 PM
> To: James Bottomley
> Cc: Desai, Kashyap; linux-scsi@vger.kernel.org
> Subject: [PATCH] mpt fusion: Cleanup some duplicate calls in mptbase.c
> 
> In mpt_detach, call to pci_set_drvdata is redundant because it
> has already been called in mpt_adapter_disable. In mpt_attach,
> ioc->pcidev is set to pdev two times.
> 
> Signed-off-by: Bandan Das <bandan.das@stratus.com>
> ---
>  drivers/message/fusion/mptbase.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/message/fusion/mptbase.c
> b/drivers/message/fusion/mptbase.c
> index a6a5701..2ec2fa7 100644
> --- a/drivers/message/fusion/mptbase.c
> +++ b/drivers/message/fusion/mptbase.c
> @@ -1770,7 +1770,6 @@ mpt_attach(struct pci_dev *pdev, const struct
> pci_device_id *id)
>  	ioc->req_sz = MPT_DEFAULT_FRAME_SIZE;		/* avoid div by
> zero! */
>  	ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
> 
> -	ioc->pcidev = pdev;
> 
>  	spin_lock_init(&ioc->taskmgmt_lock);
>  	mutex_init(&ioc->internal_cmds.mutex);
> @@ -2051,7 +2050,6 @@ mpt_detach(struct pci_dev *pdev)
> 
>  	mpt_adapter_dispose(ioc);
> 
> -	pci_set_drvdata(pdev, NULL);
>  }
> 
> 
> /**********************************************************************
> ****
> --
> 1.6.6.1