Commit 12413197 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] remove scsi_set_device 



scsi_add_host is the proper place to set the device, but people copy
the scsi_set_device usage from older drivers again and again.

note that this leaves some legacy drivers like qlogicisp/qlogicfc
without pci association in sysfs, but they're scheduled to go away soon
anyway.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 117e4b27

Documentation/scsi/scsi_mid_low_api.txt

+0 −15
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ Summary: 
   scsi_remove_device - detach and remove a SCSI device

   scsi_remove_host - detach and remove all SCSI devices owned by host

   scsi_report_bus_reset - report scsi _bus_ reset observed

   scsi_set_device - place device reference in host structure

   scsi_track_queue_full - track successive QUEUE_FULL events 

   scsi_unblock_requests - allow further commands to be queued to given host

   scsi_unregister - [calls scsi_host_put()]
@@ -740,20 +739,6 @@ int scsi_remove_host(struct Scsi_Host *shost) 
void scsi_report_bus_reset(struct Scsi_Host * shost, int channel)





/**

 * scsi_set_device - place device reference in host structure

 * @shost: a pointer to a scsi host instance

 * @pdev: pointer to device instance to assign

 *

 *      Returns nothing

 *

 *      Might block: no

 *

 *      Defined in: include/scsi/scsi_host.h .

 **/

void scsi_set_device(struct Scsi_Host * shost, struct device * dev)





/**

 * scsi_track_queue_full - track successive QUEUE_FULL events on given

 *                      device to determine if and when there is a need

drivers/message/fusion/mptfc.c

+0 −4
Original line number Diff line number Diff line
@@ -267,10 +267,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		sh->sg_tablesize = numSGE;

	}



	/* Set the pci device pointer in Scsi_Host structure.

	 */

	scsi_set_device(sh, &ioc->pcidev->dev);



	spin_unlock_irqrestore(&ioc->FreeQlock, flags);



	hd = (MPT_SCSI_HOST *) sh->hostdata;

drivers/message/fusion/mptspi.c

+0 −4
Original line number Diff line number Diff line
@@ -287,10 +287,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		sh->sg_tablesize = numSGE;

	}



	/* Set the pci device pointer in Scsi_Host structure.

	 */

	scsi_set_device(sh, &ioc->pcidev->dev);



	spin_unlock_irqrestore(&ioc->FreeQlock, flags);



	hd = (MPT_SCSI_HOST *) sh->hostdata;

drivers/scsi/advansys.c

+0 −2
Original line number Diff line number Diff line
@@ -4556,8 +4556,6 @@ advansys_detect(struct scsi_host_template *tpnt) 
                continue;

            }









	    scsi_set_device(shp, dev);

















            /* Save a pointer to the Scsi_Host of each board found. */









            asc_host[asc_board_count++] = shp;










































drivers/scsi/aic7xxx_old.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -8448,7 +8448,6 @@ aic7xxx_alloc(Scsi_Host_Template *sht, struct aic7xxx_host *temp)







    }









    p->host_no = host->host_no;









  }









  scsi_set_device(host, &p->pdev->dev);









  return (p);









}