From: Bandan Das Date: Wed, 16 Jun 2010 17:39:42 +0000 (-0400) Subject: [SCSI] mpt fusion: Cleanup some duplicate calls in mptbase.c X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=15f7fc060a7bf49991c35b23e1e7d73a1535382a;p=deliverable%2Flinux.git [SCSI] 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 Acked-by: "Desai, Kashyap" Signed-off-by: James Bottomley --- diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index d0855f278db4..c36d5b9ff663 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); @@ -2054,7 +2053,6 @@ mpt_detach(struct pci_dev *pdev) mpt_adapter_dispose(ioc); - pci_set_drvdata(pdev, NULL); } /**************************************************************************