On Tuesday, June 30, 2015 04:55:08 PM Tomeu Vizoso wrote: > Instead of calling both of_driver_match_device() and > acpi_driver_match_device(), call fwnode_driver_match_device() which > should be able to sort out what firmware describes the device in > question. > > Signed-off-by: Tomeu Vizoso <tomeu.viz...@collabora.com>
This one should be part of the other set IMO. Or please just combine the two sets so it is more clear what the new helpers are intended for. > --- > > drivers/base/platform.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index 063f0ab..a7e7757 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -843,12 +843,8 @@ static int platform_match(struct device *dev, struct > device_driver *drv) > if (pdev->driver_override) > return !strcmp(pdev->driver_override, drv->name); > > - /* Attempt an OF style match first */ > - if (of_driver_match_device(dev, drv)) > - return 1; > - > - /* Then try ACPI style match */ > - if (acpi_driver_match_device(dev, drv)) > + /* Attempt a firmware match first */ > + if (fwnode_driver_match_device(dev, drv)) > return 1; > > /* Then try to match against the id table */ > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
