| Message ID | 20180806185412.7210-2-alexandre.belloni@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for MSCC Ocelot i2c | expand |
On Mon, Aug 06, 2018 at 08:54:07PM +0200, Alexandre Belloni wrote: > Switch to device_get_match_data in probe to match the device specific data > instead of using the acpi specific function. > > Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Andy, you happy with this patch?
On Wed, 2018-08-08 at 22:22 +0200, Wolfram Sang wrote: > On Mon, Aug 06, 2018 at 08:54:07PM +0200, Alexandre Belloni wrote: > > Switch to device_get_match_data in probe to match the device > > specific data > > instead of using the acpi specific function. > > > > Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > > Andy, you happy with this patch? > Yes, yes. If you need my formal tag, here it is Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index ddf13527aaee..d117c120730d 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -86,7 +86,6 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) struct i2c_timings *t = &dev->timings; u32 ss_ht = 0, fp_ht = 0, hs_ht = 0, fs_ht = 0; acpi_handle handle = ACPI_HANDLE(&pdev->dev); - const struct acpi_device_id *id; struct acpi_device *adev; const char *uid; @@ -119,10 +118,6 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) break; } - id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev); - if (id && id->driver_data) - dev->flags |= (u32)id->driver_data; - if (acpi_bus_get_device(handle, &adev)) return -ENODEV; @@ -291,6 +286,8 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) else t->bus_freq_hz = 400000; + dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); + if (has_acpi_companion(&pdev->dev)) dw_i2c_acpi_configure(pdev);
Switch to device_get_match_data in probe to match the device specific data instead of using the acpi specific function. Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- Changes in v3: - removed unused variable - switched to uintptr_t for the cast drivers/i2c/busses/i2c-designware-platdrv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)