lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: core: Use 32-bit hostnum in scsi_host_lookup()

Browse Source 
[ Upstream commit 62ec2092095b678ff89ce4ba51c2938cd1e8e630 ]

Change scsi_host_lookup() hostnum argument type from unsigned short to
unsigned int to match the type used everywhere else.

Fixes: 6d49f63b41 ("[SCSI] Make host_no an unsigned int")
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Link: https://lore.kernel.org/r/a02497e7-c12b-ef15-47fc-3f0a0b00ffce@cybernetics.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tony Battersby 2023-08-14 10:03:25 -04:00 committed by Greg Kroah-Hartman
parent 103b41e972
commit b1e3199bad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/hosts.c
View File

@ -518,7 +518,7 @@ EXPORT_SYMBOL(scsi_host_alloc);
static int __scsi_host_match(struct device *dev, const void *data) static int __scsi_host_match(struct device *dev, const void *data)
{ {
struct Scsi_Host *p; struct Scsi_Host *p;
const unsigned short *hostnum = data; const unsigned int *hostnum = data;
p = class_to_shost(dev); p = class_to_shost(dev);
return p->host_no == *hostnum; return p->host_no == *hostnum;
@ -535,7 +535,7 @@ static int __scsi_host_match(struct device *dev, const void *data)
* that scsi_host_get() took. The put_device() below dropped * that scsi_host_get() took. The put_device() below dropped
* the reference from class_find_device(). * the reference from class_find_device().
**/ **/
struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) struct Scsi_Host *scsi_host_lookup(unsigned int hostnum)
{ {
struct device *cdev; struct device *cdev;
struct Scsi_Host *shost = NULL; struct Scsi_Host *shost = NULL;

2
include/scsi/scsi_host.h
View File

@ -744,7 +744,7 @@ extern void scsi_remove_host(struct Scsi_Host *);
extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *); extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *);
extern int scsi_host_busy(struct Scsi_Host *shost); extern int scsi_host_busy(struct Scsi_Host *shost);
extern void scsi_host_put(struct Scsi_Host *t); extern void scsi_host_put(struct Scsi_Host *t);
extern struct Scsi_Host *scsi_host_lookup(unsigned short); extern struct Scsi_Host *scsi_host_lookup(unsigned int hostnum);
extern const char *scsi_host_state_name(enum scsi_host_state); extern const char *scsi_host_state_name(enum scsi_host_state);
static inline int __must_check scsi_add_host(struct Scsi_Host *host, static inline int __must_check scsi_add_host(struct Scsi_Host *host,