android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 356da2d5c0 which is
commit 62ec2092095b678ff89ce4ba51c2938cd1e8e630 upstream.

It breaks the Android KABI and isn't needed for android systems at this
point in time.  If it is needed in the future, it can be brought back in
an abi-safe way.

Bug: 161946584
Change-Id: I2d96eecc78d7d7848d465c8759ebcf81b5276c0b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-10-03 17:16:30 +00:00
parent 734d166d62
commit cb5f0587c6
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

@ -522,7 +522,7 @@ EXPORT_SYMBOL(scsi_host_alloc);
static int __scsi_host_match(struct device *dev, const void *data)
{
struct Scsi_Host *p;
const unsigned int *hostnum = data;
const unsigned short *hostnum = data;
p = class_to_shost(dev);
return p->host_no == *hostnum;
@ -539,7 +539,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 int hostnum)
struct Scsi_Host *scsi_host_lookup(unsigned short hostnum)
{
struct device *cdev;
struct Scsi_Host *shost = NULL;

2
include/scsi/scsi_host.h
View File

@ -753,7 +753,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 int hostnum);
extern struct Scsi_Host *scsi_host_lookup(unsigned short);
extern const char *scsi_host_state_name(enum scsi_host_state);
extern void scsi_host_complete_all_commands(struct Scsi_Host *shost,
int status);