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

Commit 17ea0126 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: remove scsi_get_tag_type 



Both remaining users are better of just checking sdev->simple_tags
directly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent b70870c3

drivers/scsi/53c700.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1816,8 +1816,8 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *) 
		hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));

		hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));

	}

	}





	if((hostdata->tag_negotiated &(1<<scmd_id(SCp)))

	if ((hostdata->tag_negotiated & (1<<scmd_id(SCp))) &&

	   && scsi_get_tag_type(SCp->device)) {

	    SCp->device->simple_tags) {

		slot->tag = SCp->request->tag;

		slot->tag = SCp->request->tag;

		CDEBUG(KERN_DEBUG, SCp, "sending out tag %d, slot %p\n",

		CDEBUG(KERN_DEBUG, SCp, "sending out tag %d, slot %p\n",

		       slot->tag, slot);

		       slot->tag, slot);

drivers/scsi/ipr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5755,7 +5755,7 @@ static void ipr_erp_cancel_all(struct ipr_cmnd *ipr_cmd) 




	ipr_reinit_ipr_cmnd_for_erp(ipr_cmd);

	ipr_reinit_ipr_cmnd_for_erp(ipr_cmd);





	if (!scsi_get_tag_type(scsi_cmd->device)) {

	if (!scsi_cmd->device->simple_tags) {

		ipr_erp_request_sense(ipr_cmd);

		ipr_erp_request_sense(ipr_cmd);

		return;

		return;

	}

	}

include/scsi/scsi_tcq.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -15,19 +15,6 @@ 








#ifdef CONFIG_BLOCK

#ifdef CONFIG_BLOCK

/**

 * scsi_get_tag_type - get the type of tag the device supports

 * @sdev:	the scsi device

 */

static inline int scsi_get_tag_type(struct scsi_device *sdev)

{

	if (!sdev->tagged_supported)

		return 0;

	if (sdev->simple_tags)

		return MSG_SIMPLE_TAG;

	return 0;

}



static inline void scsi_set_tag_type(struct scsi_device *sdev, int tag)

static inline void scsi_set_tag_type(struct scsi_device *sdev, int tag)

{

{

	switch (tag) {

	switch (tag) {