* [PATCH] i2c: designware: Fix build error when !CONFIG_PM_SLEEP
@ 2015-10-21 7:09 Jarkko Nikula
2015-10-22 12:38 ` Wolfram Sang
0 siblings, 1 reply; 2+ messages in thread
From: Jarkko Nikula @ 2015-10-21 7:09 UTC (permalink / raw)
To: linux-i2c
Cc: Wolfram Sang, kbuild test robot, kbuild-all, Andy Shevchenko,
Mika Westerberg, Jarkko Nikula
Commit 6ad6fde3970c ("i2c: designware: Rename platform driver probe and PM
functions") introduced "'dw_i2c_plat_prepare' undeclared here" and
"'dw_i2c_plat_complete' undeclared here" build errors when CONFIG_PM_SLEEP
is not set.
Fix this by renaming NULL defined dw_i2c_prepare and dw_i2c_complete PM
hooks to dw_i2c_plat_prepare and dw_i2c_plat_complete since this was
obviously missing from the commit.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
drivers/i2c/busses/i2c-designware-platdrv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index f6b252a8ffd1..eb55760ccd9f 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -307,8 +307,8 @@ static void dw_i2c_plat_complete(struct device *dev)
pm_request_resume(dev);
}
#else
-#define dw_i2c_prepare NULL
-#define dw_i2c_complete NULL
+#define dw_i2c_plat_prepare NULL
+#define dw_i2c_plat_complete NULL
#endif
#ifdef CONFIG_PM
--
2.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] i2c: designware: Fix build error when !CONFIG_PM_SLEEP
2015-10-21 7:09 [PATCH] i2c: designware: Fix build error when !CONFIG_PM_SLEEP Jarkko Nikula
@ 2015-10-22 12:38 ` Wolfram Sang
0 siblings, 0 replies; 2+ messages in thread
From: Wolfram Sang @ 2015-10-22 12:38 UTC (permalink / raw)
To: Jarkko Nikula
Cc: linux-i2c, kbuild test robot, kbuild-all, Andy Shevchenko,
Mika Westerberg
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
On Wed, Oct 21, 2015 at 10:09:17AM +0300, Jarkko Nikula wrote:
> Commit 6ad6fde3970c ("i2c: designware: Rename platform driver probe and PM
> functions") introduced "'dw_i2c_plat_prepare' undeclared here" and
> "'dw_i2c_plat_complete' undeclared here" build errors when CONFIG_PM_SLEEP
> is not set.
>
> Fix this by renaming NULL defined dw_i2c_prepare and dw_i2c_complete PM
> hooks to dw_i2c_plat_prepare and dw_i2c_plat_complete since this was
> obviously missing from the commit.
>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Applied to for-next, thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-22 12:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-21 7:09 [PATCH] i2c: designware: Fix build error when !CONFIG_PM_SLEEP Jarkko Nikula
2015-10-22 12:38 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox