The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@ingics.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>,
	Thomas Abraham <thomas.abraham@linaro.org>,
	Tomasz Figa <t.figa@samsung.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] pinctrl: samsung: Add ifdef CONFIG_OF_GPIO guard for gc->of_node
Date: Mon, 05 Nov 2012 21:55:39 +0800	[thread overview]
Message-ID: <1352123739.14769.8.camel@phoenix> (raw)

This fixes below build error when !CONFIG_OF_GPIO.

  CC      drivers/pinctrl/pinctrl-samsung.o
drivers/pinctrl/pinctrl-samsung.c: In function 'samsung_pinctrl_parse_dt_pins':
drivers/pinctrl/pinctrl-samsung.c:557:19: warning: unused variable 'prop' [-Wunused-variable]
drivers/pinctrl/pinctrl-samsung.c: In function 'samsung_gpiolib_register':
drivers/pinctrl/pinctrl-samsung.c:797:5: error: 'struct gpio_chip' has no member named 'of_node'
make[2]: *** [drivers/pinctrl/pinctrl-samsung.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make: *** [drivers] Error 2

This patch also removes unused variable 'prop' to silence the build warning.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/pinctrl/pinctrl-samsung.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c
index fc34cac..8ea9735 100644
--- a/drivers/pinctrl/pinctrl-samsung.c
+++ b/drivers/pinctrl/pinctrl-samsung.c
@@ -554,7 +554,6 @@ static int __devinit samsung_pinctrl_parse_dt_pins(struct platform_device *pdev,
 			unsigned int **pin_list, unsigned int *npins)
 {
 	struct device *dev = &pdev->dev;
-	struct property *prop;
 	struct pinctrl_pin_desc const *pdesc = pctl->pins;
 	unsigned int idx = 0, cnt;
 	const char *pin_name;
@@ -794,7 +793,9 @@ static int __devinit samsung_gpiolib_register(struct platform_device *pdev,
 		gc->base = ctrl->base + bank->pin_base;
 		gc->ngpio = bank->nr_pins;
 		gc->dev = &pdev->dev;
+#if defined(CONFIG_OF_GPIO)
 		gc->of_node = bank->of_node;
+#endif
 		gc->label = bank->name;
 
 		ret = gpiochip_add(gc);
-- 
1.7.9.5




                 reply	other threads:[~2012-11-05 13:55 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1352123739.14769.8.camel@phoenix \
    --to=axel.lin@ingics.com \
    --cc=kyungmin.park@samsung.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=t.figa@samsung.com \
    --cc=thomas.abraham@linaro.org \
    /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