Skip to content

Commit 62ec209

Browse files
abattersbymartinkpetersen
authored andcommitted
scsi: core: Use 32-bit hostnum in scsi_host_lookup()
Change scsi_host_lookup() hostnum argument type from unsigned short to unsigned int to match the type used everywhere else. Fixes: 6d49f63 ("[SCSI] Make host_no an unsigned int") Signed-off-by: Tony Battersby <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Bart Van Assche <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 9a23ed5 commit 62ec209

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/scsi/hosts.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ EXPORT_SYMBOL(scsi_host_alloc);
537537
static int __scsi_host_match(struct device *dev, const void *data)
538538
{
539539
struct Scsi_Host *p;
540-
const unsigned short *hostnum = data;
540+
const unsigned int *hostnum = data;
541541

542542
p = class_to_shost(dev);
543543
return p->host_no == *hostnum;
@@ -554,7 +554,7 @@ static int __scsi_host_match(struct device *dev, const void *data)
554554
* that scsi_host_get() took. The put_device() below dropped
555555
* the reference from class_find_device().
556556
**/
557-
struct Scsi_Host *scsi_host_lookup(unsigned short hostnum)
557+
struct Scsi_Host *scsi_host_lookup(unsigned int hostnum)
558558
{
559559
struct device *cdev;
560560
struct Scsi_Host *shost = NULL;

include/scsi/scsi_host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ extern void scsi_remove_host(struct Scsi_Host *);
769769
extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *);
770770
extern int scsi_host_busy(struct Scsi_Host *shost);
771771
extern void scsi_host_put(struct Scsi_Host *t);
772-
extern struct Scsi_Host *scsi_host_lookup(unsigned short);
772+
extern struct Scsi_Host *scsi_host_lookup(unsigned int hostnum);
773773
extern const char *scsi_host_state_name(enum scsi_host_state);
774774
extern void scsi_host_complete_all_commands(struct Scsi_Host *shost,
775775
enum scsi_host_status status);

0 commit comments

Comments
 (0)