Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08b7e107 authored by Jingoo Han's avatar Jingoo Han Committed by Jiri Kosina
Browse files

SCSI: remove unnecessary pci_set_drvdata() 



Since commit 0998d063
(device-core: Ensure drvdata = NULL when no driver is bound),
the driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Cc: James Bottomley <JBottomley@parallels.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6d3be300

drivers/scsi/arcmsr/arcmsr_hba.c

+0 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,6 @@ static void arcmsr_remove(struct pci_dev *pdev) 
	pci_release_regions(pdev);

	scsi_host_put(host);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

}



static void arcmsr_shutdown(struct pci_dev *pdev)

drivers/scsi/atp870u.c

+0 −2
Original line number Diff line number Diff line
@@ -3144,8 +3144,6 @@ static void atp870u_remove (struct pci_dev *pdev) 
	atp870u_free_tables(pshost);

	printk(KERN_INFO "scsi_host_put : %p\n",pshost);

	scsi_host_put(pshost);

	printk(KERN_INFO "pci_set_drvdata : %p\n",pdev);

	pci_set_drvdata(pdev, NULL);	

}

MODULE_LICENSE("GPL");

drivers/scsi/bfa/bfad.c

+0 −1
Original line number Diff line number Diff line
@@ -833,7 +833,6 @@ bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad) 
	/* Disable PCIE Advanced Error Recovery (AER) */

	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

}



bfa_status_t

drivers/scsi/csiostor/csio_init.c

+0 −2
Original line number Diff line number Diff line
@@ -1010,7 +1010,6 @@ static int csio_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	csio_hw_stop(hw);

	spin_unlock_irq(&hw->lock);

	csio_lnodes_unblock_request(hw);

	pci_set_drvdata(hw->pdev, NULL);

	csio_lnodes_exit(hw, 0);

	csio_hw_free(hw);

err_pci_exit:
@@ -1044,7 +1043,6 @@ static void csio_remove_one(struct pci_dev *pdev) 


	csio_lnodes_exit(hw, 0);

	csio_hw_free(hw);

	pci_set_drvdata(pdev, NULL);

	csio_pci_exit(pdev, &bars);

}

drivers/scsi/dc395x.c

+0 −1
Original line number Diff line number Diff line
@@ -4859,7 +4859,6 @@ static void dc395x_remove_one(struct pci_dev *dev) 
	adapter_uninit(acb);

	pci_disable_device(dev);

	scsi_host_put(scsi_host);

	pci_set_drvdata(dev, NULL);

}