| Message ID | a02497e7-c12b-ef15-47fc-3f0a0b00ffce@cybernetics.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: core: Use 32-bit hostnum in scsi_host_lookup() | expand |
On 8/14/23 07:03, Tony Battersby wrote: > Change scsi_host_lookup() hostnum argument type from unsigned > short to unsigned int to match the type used everywhere else. Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Tony, > Change scsi_host_lookup() hostnum argument type from unsigned short to > unsigned int to match the type used everywhere else. Applied to 6.6/scsi-staging, thanks!
On Mon, 14 Aug 2023 10:03:25 -0400, Tony Battersby wrote: > Change scsi_host_lookup() hostnum argument type from unsigned > short to unsigned int to match the type used everywhere else. > > Applied to 6.6/scsi-queue, thanks! [1/1] scsi: core: Use 32-bit hostnum in scsi_host_lookup() https://git.kernel.org/mkp/scsi/c/62ec2092095b
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 198edf03f929..d7f51b84f3c7 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -537,7 +537,7 @@ EXPORT_SYMBOL(scsi_host_alloc); static int __scsi_host_match(struct device *dev, const void *data) { struct Scsi_Host *p; - const unsigned short *hostnum = data; + const unsigned int *hostnum = data; p = class_to_shost(dev); return p->host_no == *hostnum; @@ -554,7 +554,7 @@ static int __scsi_host_match(struct device *dev, const void *data) * that scsi_host_get() took. The put_device() below dropped * 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 Scsi_Host *shost = NULL; diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 70b7475dcf56..a2b8d30c4c80 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -769,7 +769,7 @@ extern void scsi_remove_host(struct Scsi_Host *); extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *); extern int scsi_host_busy(struct Scsi_Host *shost); 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 void scsi_host_complete_all_commands(struct Scsi_Host *shost, enum scsi_host_status status);
Change scsi_host_lookup() hostnum argument type from unsigned short to unsigned int to match the type used everywhere else. Fixes: 6d49f63b415c ("[SCSI] Make host_no an unsigned int") Signed-off-by: Tony Battersby <tonyb@cybernetics.com> --- drivers/scsi/hosts.c | 4 ++-- include/scsi/scsi_host.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) base-commit: 2ccdd1b13c591d306f0401d98dedc4bdcd02b421