[PATCH] scsi: core: Remove unused scsi_dev_info_list_del_keyed

[PATCH] scsi: core: Remove unused scsi_dev_info_list_del_keyed

[linux]

From: "Dr. David Alan Gilbert" <linux@treblig.org>

The last use of scsi_dev_info_list_del_keyed() was removed by 2011's
commit 2b132577a05e ("[SCSI] scsi_dh: code cleanup and remove the
references to scsi_dev_info")

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 drivers/scsi/scsi_devinfo.c | 27 ---------------------------
 drivers/scsi/scsi_priv.h    |  2 --
 2 files changed, 29 deletions(-)

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 90f1393a23f8..a348df895dca 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -485,33 +485,6 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
 	return ERR_PTR(-ENOENT);
 }
 
-/**
- * scsi_dev_info_list_del_keyed - remove one dev_info list entry.
- * @vendor:	vendor string
- * @model:	model (product) string
- * @key:	specify list to use
- *
- * Description:
- *	Remove and destroy one dev_info entry for @vendor, @model
- *	in list specified by @key.
- *
- * Returns: 0 OK, -error on failure.
- **/
-int scsi_dev_info_list_del_keyed(char *vendor, char *model,
-				 enum scsi_devinfo_key key)
-{
-	struct scsi_dev_info_list *found;
-
-	found = scsi_dev_info_list_find(vendor, model, key);
-	if (IS_ERR(found))
-		return PTR_ERR(found);
-
-	list_del(&found->dev_info_list);
-	kfree(found);
-	return 0;
-}
-EXPORT_SYMBOL(scsi_dev_info_list_del_keyed);
-
 /**
  * scsi_dev_info_list_add_str - parse dev_list and add to the scsi_dev_info_list.
  * @dev_list:	string of device flags to add
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 9fc397a9ce7a..5b2b19f5e8ec 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -79,8 +79,6 @@ extern int scsi_dev_info_list_add_keyed(int compatible, char *vendor,
 					char *model, char *strflags,
 					blist_flags_t flags,
 					enum scsi_devinfo_key key);
-extern int scsi_dev_info_list_del_keyed(char *vendor, char *model,
-					enum scsi_devinfo_key key);
 extern int scsi_dev_info_add_list(enum scsi_devinfo_key key, const char *name);
 extern int scsi_dev_info_remove_list(enum scsi_devinfo_key key);
 
-- 
2.49.0

Re: [PATCH] scsi: core: Remove unused scsi_dev_info_list_del_keyed

[Martin K. Petersen]

> The last use of scsi_dev_info_list_del_keyed() was removed by 2011's
> commit 2b132577a05e ("[SCSI] scsi_dh: code cleanup and remove the
> references to scsi_dev_info")

Applied to 6.16/scsi-staging, thanks!

-- 
Martin K. Petersen

Re: [PATCH] scsi: core: Remove unused scsi_dev_info_list_del_keyed

[Martin K. Petersen]

On Sun, 04 May 2025 00:07:42 +0100, linux@treblig.org wrote:

> The last use of scsi_dev_info_list_del_keyed() was removed by 2011's
> commit 2b132577a05e ("[SCSI] scsi_dh: code cleanup and remove the
> references to scsi_dev_info")
> 
> Remove it.
> 
> 
> [...]

Applied to 6.16/scsi-queue, thanks!

[1/1] scsi: core: Remove unused scsi_dev_info_list_del_keyed
      https://git.kernel.org/mkp/scsi/c/e256821fbe43

-- 
Martin K. Petersen	Oracle Linux Engineering