linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Gadiyar <gadiyar@ti.com>
To: linux-i2c@vger.kernel.org, linux-next@vger.kernel.org
Cc: Sourav Poddar <sourav.poddar@ti.com>,
	Anand Gadiyar <gadiyar@ti.com>, Ben Dooks <ben-linux@fluff.org>
Subject: [PATCH 1/2] i2c: i2c-omap: fix build break with CONFIG_SUSPEND=n
Date: Tue, 22 Feb 2011 12:21:26 +0530	[thread overview]
Message-ID: <1298357487-10966-1-git-send-email-gadiyar@ti.com> (raw)

From: Sourav Poddar <sourav.poddar@ti.com>

When CONFIG_SUSPEND=n, we get the following build break when
building for OMAP targets. Fix this.

  CC      drivers/i2c/busses/i2c-omap.o
drivers/i2c/busses/i2c-omap.c:1173: error: lvalue required as unary '&' operand
make[1]: *** [drivers/i2c/busses/i2c-omap.o] Error 1
make: *** [drivers/i2c/busses/] Error 2

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Ben Dooks <ben-linux@fluff.org>
--
This is a fix for a trivial build error, seen with linux-next
as of 20110217.

 drivers/i2c/busses/i2c-omap.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux-omap-usb/drivers/i2c/busses/i2c-omap.c
===================================================================
--- linux-omap-usb.orig/drivers/i2c/busses/i2c-omap.c
+++ linux-omap-usb/drivers/i2c/busses/i2c-omap.c
@@ -1156,10 +1156,11 @@ static int omap_i2c_resume(struct device
 	return 0;
 }
 
-static struct dev_pm_ops omap_i2c_pm_ops = {
+static struct dev_pm_ops omap_i2c_pm = {
 	.suspend = omap_i2c_suspend,
 	.resume = omap_i2c_resume,
 };
+#define omap_i2c_pm_ops (&omap_i2c_pm)
 #else
 #define omap_i2c_pm_ops NULL
 #endif
@@ -1170,7 +1171,7 @@ static struct platform_driver omap_i2c_d
 	.driver		= {
 		.name	= "omap_i2c",
 		.owner	= THIS_MODULE,
-		.pm     = &omap_i2c_pm_ops,
+		.pm     = omap_i2c_pm_ops,
 	},
 };
 

             reply	other threads:[~2011-02-22  6:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-22  6:51 Anand Gadiyar [this message]
     [not found] ` <1298357487-10966-1-git-send-email-gadiyar-l0cyMroinI0@public.gmane.org>
2011-02-22  6:51   ` [PATCH 2/2] i2c: i2c-omap: make dev_pm_ops a const struct Anand Gadiyar

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=1298357487-10966-1-git-send-email-gadiyar@ti.com \
    --to=gadiyar@ti.com \
    --cc=ben-linux@fluff.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sourav.poddar@ti.com \
    /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).