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

Commit 286c9408 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

mpt2sas: simplify ->change_queue_depth 



Merge two functions, and remove overly verbose debugging output that pokes
into mid-layer internal structures.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent db5ed4df

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+5 −29
Original line number Diff line number Diff line
@@ -1179,15 +1179,14 @@ _scsih_build_scatter_gather(struct MPT2SAS_ADAPTER *ioc, 
}



/**

 * _scsih_adjust_queue_depth - setting device queue depth

 * _scsih_change_queue_depth - setting device queue depth

 * @sdev: scsi device struct

 * @qdepth: requested queue depth

 *

 *

 * Returns nothing

 * Returns queue depth.

 */

static void

_scsih_adjust_queue_depth(struct scsi_device *sdev, int qdepth)

static int

_scsih_change_queue_depth(struct scsi_device *sdev, int qdepth)

{

	struct Scsi_Host *shost = sdev->host;

	int max_depth;
@@ -1217,34 +1216,11 @@ _scsih_adjust_queue_depth(struct scsi_device *sdev, int qdepth) 
	spin_unlock_irqrestore(&ioc->sas_device_lock, flags);



 not_sata:



	if (!sdev->tagged_supported)

		max_depth = 1;

	if (qdepth > max_depth)

		qdepth = max_depth;

	scsi_change_queue_depth(sdev, qdepth);

}



/**

 * _scsih_change_queue_depth - setting device queue depth

 * @sdev: scsi device struct

 * @qdepth: requested queue depth

 *

 * Returns queue depth.

 */

static int

_scsih_change_queue_depth(struct scsi_device *sdev, int qdepth)

{

	_scsih_adjust_queue_depth(sdev, qdepth);



	if (sdev->inquiry_len > 7)

		sdev_printk(KERN_INFO, sdev, "qdepth(%d), tagged(%d), "

		"simple(%d), scsi_level(%d), cmd_que(%d)\n",

		sdev->queue_depth, sdev->tagged_supported, sdev->simple_tags,

		sdev->scsi_level,

		(sdev->inquiry[7] & 2) >> 1);



	return sdev->queue_depth;

	return scsi_change_queue_depth(sdev, qdepth);

}



/**