linux-next: build warnings after merge of the tty tree

linux-next: build warnings after merge of the tty tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

Hi Greg,

After merging the tty tree, today's linux-next build (x86_64
allmodconfig) produced these warnings:

drivers/tty/serial/serial_mctrl_gpio.c: In function 'mctrl_gpio_init':
drivers/tty/serial/serial_mctrl_gpio.c:110:4: warning: return makes pointer from integer without a cast
    return PTR_ERR(gpios->gpio[i]);
    ^
drivers/tty/serial/serial_mctrl_gpio.c:90:6: warning: unused variable 'err' [-Wunused-variable]
  int err;
      ^

Introduced by commit 1d267ea6539f ("serial: mctrl-gpio: simplify init
routine").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH] fixup! serial: mctrl-gpio: simplify init routine

[Uwe Kleine-König]

---
 drivers/tty/serial/serial_mctrl_gpio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/tty/serial/serial_mctrl_gpio.c b/drivers/tty/serial/serial_mctrl_gpio.c
index 5027db7b5814..0ec756c62bcf 100644
--- a/drivers/tty/serial/serial_mctrl_gpio.c
+++ b/drivers/tty/serial/serial_mctrl_gpio.c
@@ -87,7 +87,6 @@ struct mctrl_gpios *mctrl_gpio_init(struct device *dev, unsigned int idx)
 {
 	struct mctrl_gpios *gpios;
 	enum mctrl_gpio_idx i;
-	int err;
 
 	gpios = devm_kzalloc(dev, sizeof(*gpios), GFP_KERNEL);
 	if (!gpios)
@@ -107,7 +106,7 @@ struct mctrl_gpios *mctrl_gpio_init(struct device *dev, unsigned int idx)
 						      idx, flags);
 
 		if (IS_ERR(gpios->gpio[i]))
-			return PTR_ERR(gpios->gpio[i]);
+			return ERR_CAST(gpios->gpio[i]);
 	}
 
 	return gpios;
-- 
2.1.4

Re: [PATCH] fixup! serial: mctrl-gpio: simplify init routine

[Greg KH]

On Tue, Mar 10, 2015 at 09:29:51AM +0100, Uwe Kleine-König wrote:
> ---
>  drivers/tty/serial/serial_mctrl_gpio.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

No changelog comment, no signed-off-by: and some odd "fixup!" in the
subject line :(

Please fix and resend so that I can actually apply the thing.

thanks,

greg k-h