From: Fabio Estevam Date: Tue, 10 Mar 2015 15:23:18 +0000 (-0300) Subject: serial: mctrl_gpio: Fix build warnings X-Git-Tag: firefly_0821_release~176^2~1907^2~75 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=13bc2bb9a0075342707e853e6dac298f0bbca111;p=firefly-linux-kernel-4.4.55.git serial: mctrl_gpio: Fix build warnings Fix the following build 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]); ^ /home/build/work/batch/drivers/tty/serial/serial_mctrl_gpio.c:90:6: warning: unused variable 'err' [-Wunused-variable] int err; ^ Return ERR_CAST and remove the unused 'err' variable to fix them. Fixes: 1d267ea6539f ("serial: mctrl-gpio: simplify init routine") Reported-by: Olof's autobuilder Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman --- 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;