Skip to contentSkip to conversation

scsi: iscsi: Make iscsi_unregister_transport() return void

PATCH Applied Max Gurtovoy 3 participants 4 messages Jun 16, 2022 – Jun 22, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: iscsi: Make iscsi_unregister_transport() return void

This function always returns 0. We can make it return void to simplify the code. Also, no caller ever checks the return value of this function.

---
 drivers/scsi/scsi_transport_iscsi.c | 4 +---
 include/scsi/scsi_transport_iscsi.h | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +1 -3
index 2c0dd64159b0..5601633837cc 100644
@@ -4807,7 +4807,7 @@ iscsi_register_transport(struct iscsi_transport *tt)
 }
 EXPORT_SYMBOL_GPL(iscsi_register_transport);
 
-int iscsi_unregister_transport(struct iscsi_transport *tt)
+void iscsi_unregister_transport(struct iscsi_transport *tt)
 {
 	struct iscsi_internal *priv;
 	unsigned long flags;
@@ -4830,8 +4830,6 @@ int iscsi_unregister_transport(struct iscsi_transport *tt)
 	sysfs_remove_group(&priv->dev.kobj, &iscsi_transport_group);
 	device_unregister(&priv->dev);
 	mutex_unlock(&rx_queue_mutex);
-
-	return 0;
 }
 EXPORT_SYMBOL_GPL(iscsi_unregister_transport);
 
include/scsi/scsi_transport_iscsi.h +1 -1
index 9acb8422f680..695396a5f607 100644
@@ -162,7 +162,7 @@ struct iscsi_transport {
  * transport registration upcalls
  */
 extern struct scsi_transport_template *iscsi_register_transport(struct iscsi_transport *tt);
-extern int iscsi_unregister_transport(struct iscsi_transport *tt);
+extern void iscsi_unregister_transport(struct iscsi_transport *tt);
 
 /*
  * control plane upcalls
Signature · 1 line
2.18.1
#2 lore raw
In reply to Max Gurtovoy

Max,

Quoted 2 lines

This function always returns 0. We can make it return void to simplify the code. Also, no caller ever checks the return value of this function.

Applied to 5.20/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering