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

Commit cc4238bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "A tiny update: one patch corrects a Kconfig problem with the shift of
  the SAS SMP code to BSG and the other removes a vestige of user space
  target mode"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: scsi_transport_sas: select BLK_DEV_BSGLIB
  scsi: Remove Scsi_Host.uspace_req_q
parents 80a0d644 580b71e9

drivers/scsi/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -283,7 +283,7 @@ config SCSI_ISCSI_ATTRS 
config SCSI_SAS_ATTRS

config SCSI_SAS_ATTRS

	tristate "SAS Transport Attributes"

	tristate "SAS Transport Attributes"

	depends on SCSI

	depends on SCSI

	select BLK_DEV_BSG

	select BLK_DEV_BSGLIB

	help

	help

	  If you wish to export transport-specific information about

	  If you wish to export transport-specific information about

	  each attached SAS device to sysfs, say Y.

	  each attached SAS device to sysfs, say Y.

drivers/scsi/hosts.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -315,8 +315,6 @@ static void scsi_host_dev_release(struct device *dev) 
{

{

	struct Scsi_Host *shost = dev_to_shost(dev);

	struct Scsi_Host *shost = dev_to_shost(dev);

	struct device *parent = dev->parent;

	struct device *parent = dev->parent;

	struct request_queue *q;

	void *queuedata;





	scsi_proc_hostdir_rm(shost->hostt);

	scsi_proc_hostdir_rm(shost->hostt);
@@ -326,12 +324,6 @@ static void scsi_host_dev_release(struct device *dev) 
		kthread_stop(shost->ehandler);

		kthread_stop(shost->ehandler);

	if (shost->work_q)

	if (shost->work_q)

		destroy_workqueue(shost->work_q);

		destroy_workqueue(shost->work_q);

	q = shost->uspace_req_q;

	if (q) {

		queuedata = q->queuedata;

		blk_cleanup_queue(q);

		kfree(queuedata);

	}





	if (shost->shost_state == SHOST_CREATED) {

	if (shost->shost_state == SHOST_CREATED) {

		/*

		/*

include/scsi/scsi_host.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -691,12 +691,6 @@ struct Scsi_Host { 
	unsigned int prot_capabilities;

	unsigned int prot_capabilities;

	unsigned char prot_guard_type;

	unsigned char prot_guard_type;





	/*

	 * q used for scsi_tgt msgs, async events or any other requests that

	 * need to be processed in userspace

	 */

	struct request_queue *uspace_req_q;



	/* legacy crap */

	/* legacy crap */

	unsigned long base;

	unsigned long base;

	unsigned long io_port;

	unsigned long io_port;