Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 445df7ff authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

serial: mctrl-gpio: drop usages of IS_ERR_OR_NULL 



The function mctrl_gpio_init returns failure if the assignment to any
member of the gpio array results in an error pointer.  So there is no
need to check for such error values in the other functions.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c33eecc7

drivers/tty/serial/serial_mctrl_gpio.c

+2 −3
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ void mctrl_gpio_set(struct mctrl_gpios *gpios, unsigned int mctrl) 
	unsigned int count = 0;



	for (i = 0; i < UART_GPIO_MAX; i++)

		if (!IS_ERR_OR_NULL(gpios->gpio[i]) &&

		    mctrl_gpios_desc[i].dir_out) {

		if (gpios->gpio[i] && mctrl_gpios_desc[i].dir_out) {

			desc_array[count] = gpios->gpio[i];

			value_array[count] = !!(mctrl & mctrl_gpios_desc[i].mctrl);

			count++;
@@ -118,7 +117,7 @@ void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios) 
	enum mctrl_gpio_idx i;



	for (i = 0; i < UART_GPIO_MAX; i++)

		if (!IS_ERR_OR_NULL(gpios->gpio[i]))

		if (gpios->gpio[i])

			devm_gpiod_put(dev, gpios->gpio[i]);

	devm_kfree(dev, gpios);

}