From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Wolfram Sang <wsa@the-dreams.de>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
James Hogan <jhogan@kernel.org>
Cc: Paul Burton <paul.burton@mips.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-i2c@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mips@linux-mips.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Allan Nielsen <allan.nielsen@microsemi.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH v2 1/6] i2c: designware: use generic table matching
Date: Tue, 31 Jul 2018 15:47:35 +0200 [thread overview]
Message-ID: <20180731134740.441-2-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20180731134740.441-1-alexandre.belloni@bootlin.com>
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>
---
drivers/i2c/busses/i2c-designware-platdrv.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index ddf13527aaee..00bf62f77c47 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -119,10 +119,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;
@@ -269,6 +265,8 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
else
i2c_parse_fw_timings(&pdev->dev, t, false);
+ dev->flags |= (u32)device_get_match_data(&pdev->dev);
+
acpi_speed = i2c_acpi_find_bus_speed(&pdev->dev);
/*
* Some DSTDs use a non standard speed, round down to the lowest
--
2.18.0
next prev parent reply other threads:[~2018-07-31 13:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 13:47 [PATCH v2 0/6] Add support for MSCC Ocelot i2c Alexandre Belloni
2018-07-31 13:47 ` Alexandre Belloni [this message]
2018-07-31 14:02 ` [PATCH v2 1/6] i2c: designware: use generic table matching Andy Shevchenko
2018-07-31 14:23 ` Andy Shevchenko
2018-07-31 14:30 ` Alexandre Belloni
2018-07-31 14:53 ` Andy Shevchenko
2018-07-31 18:44 ` Alexandre Belloni
2018-07-31 20:41 ` Alexandre Belloni
2018-07-31 13:47 ` [PATCH v2 2/6] i2c: designware: move #ifdef CONFIG_OF to the top Alexandre Belloni
2018-07-31 14:04 ` Andy Shevchenko
2018-07-31 13:47 ` [PATCH v2 3/6] i2c: designware: allow IP specific sda_hold_time Alexandre Belloni
2018-07-31 13:47 ` [PATCH v2 4/6] i2c: designware: add MSCC Ocelot support Alexandre Belloni
2018-07-31 14:13 ` Andy Shevchenko
2018-07-31 13:47 ` [PATCH v2 5/6] mips: dts: mscc: Add i2c on ocelot Alexandre Belloni
2018-07-31 13:47 ` [PATCH v2 6/6] mips: dts: mscc: enable i2c on ocelot_pcb123 Alexandre Belloni
2018-07-31 14:17 ` [PATCH v2 0/6] Add support for MSCC Ocelot i2c Andy Shevchenko
2018-07-31 14:29 ` Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180731134740.441-2-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--cc=allan.nielsen@microsemi.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=jarkko.nikula@linux.intel.com \
--cc=jhogan@kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=mika.westerberg@linux.intel.com \
--cc=paul.burton@mips.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.