public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Paul Mundt <lethal@linux-sh.org>
Cc: "Linux-sh list" <linux-sh@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH] sh: pfc: Fix build issues in pinctrl.c
Date: Sat, 28 Jul 2012 00:07:04 +0200	[thread overview]
Message-ID: <201207280007.04480.rjw@sisk.pl> (raw)


First off, drivers/sh/pfc/pinctrl.c doesn't build after commit
5d589b0 (pinctrl: remove pinctrl_remove_gpio_range), because
sh_pfc_pinctrl_remove() uses the function that has been removed by
that commit.  Fix this by removing the pinctrl_remove_gpio_range()
call, which is not necessary any more, from sh_pfc_pinctrl_remove().

Second, the compiler complains correctly that there's an unused
local variable in sh_pfc_pinconf_set().  Fix this by removing the
definition of that variable.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/sh/pfc/pinctrl.c |    2 --
 1 file changed, 2 deletions(-)

Index: linux/drivers/sh/pfc/pinctrl.c
===================================================================
--- linux.orig/drivers/sh/pfc/pinctrl.c
+++ linux/drivers/sh/pfc/pinctrl.c
@@ -276,7 +276,6 @@ static int sh_pfc_pinconf_set(struct pin
 			      unsigned long config)
 {
 	struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);
-	struct sh_pfc *pfc = pmx->pfc;
 
 	/* Validate the new type */
 	if (config >= PINMUX_FLAG_TYPE)
@@ -481,7 +480,6 @@ static int __devexit sh_pfc_pinctrl_remo
 {
 	struct sh_pfc_pinctrl *pmx = platform_get_drvdata(pdev);
 
-	pinctrl_remove_gpio_range(pmx->pctl, &sh_pfc_gpio_range);
 	pinctrl_unregister(pmx->pctl);
 
 	platform_set_drvdata(pdev, NULL);

             reply	other threads:[~2012-07-27 22:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-27 22:07 Rafael J. Wysocki [this message]
2012-07-28  0:29 ` [PATCH] sh: pfc: Fix build issues in pinctrl.c Paul Mundt
2012-07-28 13:13   ` Rafael J. Wysocki

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=201207280007.04480.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=lethal@linux-sh.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.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