Skip to content

Commit e256821

Browse files
Dr. David Alan Gilbertmartinkpetersen
authored andcommitted
scsi: core: Remove unused scsi_dev_info_list_del_keyed()
The last use of scsi_dev_info_list_del_keyed() was removed by 2011's commit 2b13257 ("[SCSI] scsi_dh: code cleanup and remove the references to scsi_dev_info") Remove it. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 7c56921 commit e256821

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

drivers/scsi/scsi_devinfo.c

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -485,33 +485,6 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
485485
return ERR_PTR(-ENOENT);
486486
}
487487

488-
/**
489-
* scsi_dev_info_list_del_keyed - remove one dev_info list entry.
490-
* @vendor: vendor string
491-
* @model: model (product) string
492-
* @key: specify list to use
493-
*
494-
* Description:
495-
* Remove and destroy one dev_info entry for @vendor, @model
496-
* in list specified by @key.
497-
*
498-
* Returns: 0 OK, -error on failure.
499-
**/
500-
int scsi_dev_info_list_del_keyed(char *vendor, char *model,
501-
enum scsi_devinfo_key key)
502-
{
503-
struct scsi_dev_info_list *found;
504-
505-
found = scsi_dev_info_list_find(vendor, model, key);
506-
if (IS_ERR(found))
507-
return PTR_ERR(found);
508-
509-
list_del(&found->dev_info_list);
510-
kfree(found);
511-
return 0;
512-
}
513-
EXPORT_SYMBOL(scsi_dev_info_list_del_keyed);
514-
515488
/**
516489
* scsi_dev_info_list_add_str - parse dev_list and add to the scsi_dev_info_list.
517490
* @dev_list: string of device flags to add

drivers/scsi/scsi_priv.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ extern int scsi_dev_info_list_add_keyed(int compatible, char *vendor,
7979
char *model, char *strflags,
8080
blist_flags_t flags,
8181
enum scsi_devinfo_key key);
82-
extern int scsi_dev_info_list_del_keyed(char *vendor, char *model,
83-
enum scsi_devinfo_key key);
8482
extern int scsi_dev_info_add_list(enum scsi_devinfo_key key, const char *name);
8583
extern int scsi_dev_info_remove_list(enum scsi_devinfo_key key);
8684

0 commit comments

Comments
 (0)