Skip to contentSkip to conversation

scsi: fnic: Remove unused function fnic_scsi_host_start/end_tag()

PATCH Applied Yang Li 4 participants 4 messages Aug 29, 2023 – Aug 31, 2023

Subsystems (2)
lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/1 scsi: fnic: Remove unused function fnic_scsi_host_start/end_tag()

The function fnic_scsi_host_start_tag() and fnic_scsi_host_end_tag() are not used anywhere, so remove them.

silence the warnings:
drivers/scsi/fnic/fnic_scsi.c:2175:1: warning: unused function 'fnic_scsi_host_start_tag' drivers/scsi/fnic/fnic_scsi.c:2196:1: warning: unused function 'fnic_scsi_host_end_tag'

---
 drivers/scsi/fnic/fnic_scsi.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +0 -33
index 185142efee3d..9761b2c9db48 100644
@@ -2167,39 +2167,6 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
 	return ret;
 }
 
-/*
- * fnic_scsi_host_start_tag
- * Allocates tagid from host's tag list
- **/
-static inline int
-fnic_scsi_host_start_tag(struct fnic *fnic, struct scsi_cmnd *sc)
-{
-	struct request *rq = scsi_cmd_to_rq(sc);
-	struct request_queue *q = rq->q;
-	struct request *dummy;
-
-	dummy = blk_mq_alloc_request(q, REQ_OP_WRITE, BLK_MQ_REQ_NOWAIT);
-	if (IS_ERR(dummy))
-		return SCSI_NO_TAG;
-
-	rq->tag = dummy->tag;
-	sc->host_scribble = (unsigned char *)dummy;
-
-	return dummy->tag;
-}
-
-/*
- * fnic_scsi_host_end_tag
- * frees tag allocated by fnic_scsi_host_start_tag.
- **/
-static inline void
-fnic_scsi_host_end_tag(struct fnic *fnic, struct scsi_cmnd *sc)
-{
-	struct request *dummy = (struct request *)sc->host_scribble;
-
-	blk_mq_free_request(dummy);
-}
-
 /*
  * SCSI Eh thread issues a Lun Reset when one or more commands on a LUN
  * fail to get aborted. It calls driver's eh_device_reset with a SCSI command
Signature · 1 line
2.20.1.7.g153144c
maintainer Acked-by on v1 1/1
#1 lore raw

Hi Yang,

Thanks for the changes. Looks good to me.

Regards,
Karan

-----Original Message-----
From: Yang Li <[email protected]>
Sent: Monday, August 28, 2023 6:02 PM
To: [email protected]; [email protected]; Satish Kharat (satishkh) <[email protected]>; Sesidhar Baddela (sebaddel) <[email protected]>; Karan Tilak Kumar (kartilak) <[email protected]>
Cc: [email protected]; [email protected]; Yang Li <[email protected]>
Subject: [PATCH -next] scsi: fnic: Remove unused function fnic_scsi_host_start/end_tag()

The function fnic_scsi_host_start_tag() and fnic_scsi_host_end_tag() are not used anywhere, so remove them.

silence the warnings:
drivers/scsi/fnic/fnic_scsi.c:2175:1: warning: unused function 'fnic_scsi_host_start_tag' drivers/scsi/fnic/fnic_scsi.c:2196:1: warning: unused function 'fnic_scsi_host_end_tag'

---
 drivers/scsi/fnic/fnic_scsi.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +0 -32
@@ -2167,39 +2167,6 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
 	return ret;
 }
 
-/*
- * fnic_scsi_host_start_tag
- * Allocates tagid from host's tag list
- **/
-static inline int
-fnic_scsi_host_start_tag(struct fnic *fnic, struct scsi_cmnd *sc) -{
-	struct request *rq = scsi_cmd_to_rq(sc);
-	struct request_queue *q = rq->q;
-	struct request *dummy;
-
-	dummy = blk_mq_alloc_request(q, REQ_OP_WRITE, BLK_MQ_REQ_NOWAIT);
-	if (IS_ERR(dummy))
-		return SCSI_NO_TAG;
-
-	rq->tag = dummy->tag;
-	sc->host_scribble = (unsigned char *)dummy;
-
-	return dummy->tag;
-}
-
-/*
- * fnic_scsi_host_end_tag
- * frees tag allocated by fnic_scsi_host_start_tag.
- **/
-static inline void
-fnic_scsi_host_end_tag(struct fnic *fnic, struct scsi_cmnd *sc) -{
-	struct request *dummy = (struct request *)sc->host_scribble;
-
-	blk_mq_free_request(dummy);
-}
-
 /*
  * SCSI Eh thread issues a Lun Reset when one or more commands on a LUN
  * fail to get aborted. It calls driver's eh_device_reset with a SCSI command
--

2.20.1.7.g153144c

#2 lore raw
In reply to Yang Li
Quoted 2 lines · Yang Li

The function fnic_scsi_host_start_tag() and fnic_scsi_host_end_tag() are not used anywhere, so remove them.

Are you sure? I think the following output shows that these are being used:

$ git grep -nHEw 'fnic_scsi_host_(start|end)_tag'
drivers/scsi/fnic/fnic_scsi.c:2171: * fnic_scsi_host_start_tag
drivers/scsi/fnic/fnic_scsi.c:2175:fnic_scsi_host_start_tag(struct fnic *fnic, struct scsi_cmnd *sc)
drivers/scsi/fnic/fnic_scsi.c:2192: * fnic_scsi_host_end_tag
drivers/scsi/fnic/fnic_scsi.c:2193: * frees tag allocated by fnic_scsi_host_start_tag.
drivers/scsi/fnic/fnic_scsi.c:2196:fnic_scsi_host_end_tag(struct fnic *fnic, struct scsi_cmnd *sc)
drivers/scsi/fnic/fnic_scsi.c:2262:		tag = fnic_scsi_host_start_tag(fnic, sc);
drivers/scsi/fnic/fnic_scsi.c:2439:		fnic_scsi_host_end_tag(fnic, sc);

Bart.

#3 lore raw
In reply to Yang Li

Yang,

Quoted 2 lines

The function fnic_scsi_host_start_tag() and fnic_scsi_host_end_tag() are not used anywhere, so remove them.

Applied to 6.6/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering