* [PATCH] i2c-omap: fix build for !CONFIG_SUSPEND
@ 2011-02-22 6:55 Balaji T K
[not found] ` <1298357739-5132-1-git-send-email-balajitk-l0cyMroinI0@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Balaji T K @ 2011-02-22 6:55 UTC (permalink / raw)
To: linux-i2c, ben-linux; +Cc: linux-omap, khilman, Balaji T K
fix the build break when !CONFIG_SUSPEND
drivers/i2c/busses/i2c-omap.c:1173: error: lvalue required as unary '&' operand
make[3]: *** [drivers/i2c/busses/i2c-omap.o] Error 1
make[2]: *** [drivers/i2c/busses] Error 2
make[1]: *** [drivers/i2c] Error 2
make: *** [drivers] Error 2
Signed-off-by: Balaji T K <balajitk@ti.com>
---
introduced by commit f6f98d72575031b0c03416a28a0d580128114b74
applies on i2c-fixes branch
drivers/i2c/busses/i2c-omap.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 0541df9..adc1ee5 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1160,8 +1160,9 @@ static struct dev_pm_ops omap_i2c_pm_ops = {
.suspend = omap_i2c_suspend,
.resume = omap_i2c_resume,
};
+#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops)
#else
-#define omap_i2c_pm_ops NULL
+#define OMAP_I2C_PM_OPS NULL
#endif
static struct platform_driver omap_i2c_driver = {
@@ -1170,7 +1171,7 @@ static struct platform_driver omap_i2c_driver = {
.driver = {
.name = "omap_i2c",
.owner = THIS_MODULE,
- .pm = &omap_i2c_pm_ops,
+ .pm = OMAP_I2C_PM_OPS,
},
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] i2c-omap: fix build for !CONFIG_SUSPEND
[not found] ` <1298357739-5132-1-git-send-email-balajitk-l0cyMroinI0@public.gmane.org>
@ 2011-03-01 0:48 ` Kevin Hilman
0 siblings, 0 replies; 2+ messages in thread
From: Kevin Hilman @ 2011-03-01 0:48 UTC (permalink / raw)
To: Balaji T K
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA,
ben-linux-elnMNo+KYs3YtjvyW6yDsg,
linux-omap-u79uwXL29TY76Z2rM5mHXA
Balaji T K <balajitk-l0cyMroinI0@public.gmane.org> writes:
> fix the build break when !CONFIG_SUSPEND
>
> drivers/i2c/busses/i2c-omap.c:1173: error: lvalue required as unary '&' operand
> make[3]: *** [drivers/i2c/busses/i2c-omap.o] Error 1
> make[2]: *** [drivers/i2c/busses] Error 2
> make[1]: *** [drivers/i2c] Error 2
> make: *** [drivers] Error 2
>
> Signed-off-by: Balaji T K <balajitk-l0cyMroinI0@public.gmane.org>
Acked-by: Kevin Hilman <khilman-l0cyMroinI0@public.gmane.org>
Ben, feel free to fold into original patch if preferred.
Kevin
> ---
> introduced by commit f6f98d72575031b0c03416a28a0d580128114b74
> applies on i2c-fixes branch
>
> drivers/i2c/busses/i2c-omap.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index 0541df9..adc1ee5 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -1160,8 +1160,9 @@ static struct dev_pm_ops omap_i2c_pm_ops = {
> .suspend = omap_i2c_suspend,
> .resume = omap_i2c_resume,
> };
> +#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops)
> #else
> -#define omap_i2c_pm_ops NULL
> +#define OMAP_I2C_PM_OPS NULL
> #endif
>
> static struct platform_driver omap_i2c_driver = {
> @@ -1170,7 +1171,7 @@ static struct platform_driver omap_i2c_driver = {
> .driver = {
> .name = "omap_i2c",
> .owner = THIS_MODULE,
> - .pm = &omap_i2c_pm_ops,
> + .pm = OMAP_I2C_PM_OPS,
> },
> };
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-01 0:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 6:55 [PATCH] i2c-omap: fix build for !CONFIG_SUSPEND Balaji T K
[not found] ` <1298357739-5132-1-git-send-email-balajitk-l0cyMroinI0@public.gmane.org>
2011-03-01 0:48 ` Kevin Hilman
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).