diff options
| author |   Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2019-07-30 22:36:31 +0200 |
|---|---|---|
| committer | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2019-07-30 22:36:31 +0200 |
| commit | be7fc2cc86170bea31e1db8d596f35df52254971 (patch) | |
| tree | 31ca140aec74decbf18dfce1a7869aeeb8dcbf84 /drivers/scsi/scsi_proc.c | |
| parent | leds: netxbig: Add of_node_put() in netxbig_leds_get_of_pdata() (diff) | |
| parent | platform: Add platform_find_device_by_driver() helper (diff) | |
| download | linux-dev-be7fc2cc86170bea31e1db8d596f35df52254971.tar.xz linux-dev-be7fc2cc86170bea31e1db8d596f35df52254971.zip | |
Merge tag 'generic_lookup_helpers' into for-next
Generic Device Lookup Helpers
Persistent tag for others to pull this branch from
Based on patch series from Suzuki K Poulose <suzuki.poulose@arm.com>
with Subject: [PATCH v3 0/7] drivers: Add generic device lookup helpers
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* tag 'generic_lookup_helpers':
platform: Add platform_find_device_by_driver() helper
drivers: Add generic helper to match any device
drivers: Introduce device lookup variants by ACPI_COMPANION device
drivers: Introduce device lookup variants by device type
drivers: Introduce device lookup variants by fwnode
drivers: Introduce device lookup variants by of_node
drivers: Introduce device lookup variants by name
Diffstat (limited to 'drivers/scsi/scsi_proc.c')
| -rw-r--r-- | drivers/scsi/scsi_proc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index c074631086a4..5b313226f11c 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c @@ -372,15 +372,10 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf, return err; } -static int always_match(struct device *dev, const void *data) -{ - return 1; -} - static inline struct device *next_scsi_device(struct device *start) { - struct device *next = bus_find_device(&scsi_bus_type, start, NULL, - always_match); + struct device *next = bus_find_next_device(&scsi_bus_type, start); + put_device(start); return next; } |