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 v4 2/7] i2c: designware: move #ifdef CONFIG_OF to the top
Date: Thu, 16 Aug 2018 10:45:16 +0200 [thread overview]
Message-ID: <20180816084521.16289-3-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20180816084521.16289-1-alexandre.belloni@bootlin.com>
Move the #ifdef CONFIG_OF section to the top of the file, after the ACPI
section so functions defined there can be used in dw_i2c_plat_probe.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
drivers/i2c/busses/i2c-designware-platdrv.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index d5936c32c075..776d4354f366 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -169,6 +169,14 @@ static inline int dw_i2c_acpi_configure(struct platform_device *pdev)
}
#endif
+#ifdef CONFIG_OF
+static const struct of_device_id dw_i2c_of_match[] = {
+ { .compatible = "snps,designware-i2c", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, dw_i2c_of_match);
+#endif
+
static void i2c_dw_configure_master(struct dw_i2c_dev *dev)
{
struct i2c_timings *t = &dev->timings;
@@ -403,14 +411,6 @@ static int dw_i2c_plat_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_OF
-static const struct of_device_id dw_i2c_of_match[] = {
- { .compatible = "snps,designware-i2c", },
- {},
-};
-MODULE_DEVICE_TABLE(of, dw_i2c_of_match);
-#endif
-
#ifdef CONFIG_PM_SLEEP
static int dw_i2c_plat_prepare(struct device *dev)
{
--
2.18.0
next prev parent reply other threads:[~2018-08-16 8:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 8:45 [PATCH v4 0/7] Add support for MSCC Ocelot i2c Alexandre Belloni
2018-08-16 8:45 ` [PATCH v4 1/7] i2c: designware: use generic table matching Alexandre Belloni
2018-08-16 8:45 ` Alexandre Belloni [this message]
2018-08-16 8:45 ` [PATCH v4 3/7] i2c: designware: allow IP specific sda_hold_time Alexandre Belloni
2018-08-16 8:45 ` [PATCH v4 4/7] i2c: designware: document MSCC Ocelot bindings Alexandre Belloni
2018-08-17 15:09 ` Rob Herring
2018-08-20 18:13 ` Rob Herring
2018-08-20 19:34 ` Alexandre Belloni
2018-08-16 8:45 ` [PATCH v4 5/7] i2c: designware: add MSCC Ocelot support Alexandre Belloni
2018-08-16 8:45 ` [PATCH v4 6/7] MIPS: dts: mscc: Add i2c on ocelot Alexandre Belloni
2018-08-16 8:45 ` [PATCH v4 7/7] MIPS: dts: mscc: enable i2c on ocelot_pcb123 Alexandre Belloni
2018-08-16 10:58 ` [PATCH v4 0/7] Add support for MSCC Ocelot i2c Jarkko Nikula
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=20180816084521.16289-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).