Merge generic_lookup_helpers into usb-next

The lookup helpers are needed here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/base/devcon.c
Simple merge

diff --cc drivers/base/platform.c
Simple merge

diff --cc drivers/hwtracing/stm/core.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_hw_v1.c
Simple merge

diff --cc drivers/iommu/arm-smmu-v3.c
Simple merge

diff --cc drivers/regulator/of_regulator.c
Simple merge

diff --cc drivers/usb/core/devio.c
Simple merge

diff --cc drivers/usb/roles/class.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/platform_device.h
index 34a3d8ed8ba7c37ccb805095521a4de1d82303a4,37e15a935a42f4fb2bc2575ae2451a3026d24e41..3fce4ec63dc270cc976ab8a86876176d3a096aec
--- 1/include/linux/platform_device.h
--- 2/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@@ -49,8 -48,12 +49,11 @@@ extern void platform_device_unregister(
  extern struct bus_type platform_bus_type;
  extern struct device platform_bus;
  
 -extern void arch_setup_pdev_archdata(struct platform_device *);
  extern struct resource *platform_get_resource(struct platform_device *,
                                              unsigned int, unsigned int);
+ extern struct device *
+ platform_find_device_by_driver(struct device *start,
+                              const struct device_driver *drv);
  extern void __iomem *
  devm_platform_ioremap_resource(struct platform_device *pdev,
                               unsigned int index);