forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

serial: max310x: Always use dynamic GPIO ID assignment

Browse source 
Always register GPIOs and use dynamic GPIO ID assignment.
This is no much worth if GPIOs is not used, but helps remove
private driver header and add DT support in the future.
Additionally, patch adds missing uart_unregister_driver()
call if probe() fails.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Shiyan 2014-02-10 22:18:32 +04:00 • committed by Greg Kroah-Hartman
commit dba29a2894
2 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

55
drivers/tty/serial/max310x.c
View file

@ -294,7 +294,6 @@ struct max310x_port {
struct mutex mutex; struct mutex mutex;
struct clk *clk; struct clk *clk;
struct max310x_pdata *pdata; struct max310x_pdata *pdata;
int gpio_used;
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
struct gpio_chip gpio; struct gpio_chip gpio;
#endif #endif
@ -1177,6 +1176,23 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype,
goto out_clk; goto out_clk;
} }
#ifdef CONFIG_GPIOLIB
/* Setup GPIO cotroller */
s->gpio.owner = THIS_MODULE;
s->gpio.dev = dev;
s->gpio.label = dev_name(dev);
s->gpio.direction_input = max310x_gpio_direction_input;
s->gpio.get = max310x_gpio_get;
s->gpio.direction_output= max310x_gpio_direction_output;
s->gpio.set = max310x_gpio_set;
s->gpio.base = -1;
s->gpio.ngpio = devtype->nr * 4;
s->gpio.can_sleep = 1;
ret = gpiochip_add(&s->gpio);
if (ret)
goto out_uart;
#endif
for (i = 0; i < devtype->nr; i++) { for (i = 0; i < devtype->nr; i++) {
/* Initialize port data */ /* Initialize port data */
s->p[i].port.line = i; s->p[i].port.line = i;
@ -1208,25 +1224,6 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype,
devtype->power(&s->p[i].port, 0); devtype->power(&s->p[i].port, 0);
} }
#ifdef CONFIG_GPIOLIB
/* Setup GPIO cotroller */
if (s->pdata->gpio_base) {
s->gpio.owner = THIS_MODULE;
s->gpio.dev = dev;
s->gpio.label = dev_name(dev);
s->gpio.direction_input = max310x_gpio_direction_input;
s->gpio.get = max310x_gpio_get;
s->gpio.direction_output= max310x_gpio_direction_output;
s->gpio.set = max310x_gpio_set;
s->gpio.base = s->pdata->gpio_base;
s->gpio.ngpio = devtype->nr * 4;
s->gpio.can_sleep = 1;
if (!gpiochip_add(&s->gpio))
s->gpio_used = 1;
} else
dev_info(dev, "GPIO support not enabled\n");
#endif
/* Setup interrupt */ /* Setup interrupt */
ret = devm_request_threaded_irq(dev, irq, NULL, max310x_ist, ret = devm_request_threaded_irq(dev, irq, NULL, max310x_ist,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
@ -1235,11 +1232,14 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype,
return 0; return 0;
dev_err(dev, "Unable to reguest IRQ %i\n", irq); dev_err(dev, "Unable to reguest IRQ %i\n", irq);
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
if (s->gpio_used) WARN_ON(gpiochip_remove(&s->gpio));
WARN_ON(gpiochip_remove(&s->gpio));
#endif #endif
out_uart:
uart_unregister_driver(&s->uart);
out_clk: out_clk:
clk_disable_unprepare(s->clk); clk_disable_unprepare(s->clk);
@ -1251,6 +1251,12 @@ static int max310x_remove(struct device *dev)
struct max310x_port *s = dev_get_drvdata(dev); struct max310x_port *s = dev_get_drvdata(dev);
int i, ret = 0; int i, ret = 0;
#ifdef CONFIG_GPIOLIB
ret = gpiochip_remove(&s->gpio);
if (ret)
return ret;
#endif
for (i = 0; i < s->uart.nr; i++) { for (i = 0; i < s->uart.nr; i++) {
cancel_work_sync(&s->p[i].tx_work); cancel_work_sync(&s->p[i].tx_work);
cancel_work_sync(&s->p[i].md_work); cancel_work_sync(&s->p[i].md_work);
@ -1261,11 +1267,6 @@ static int max310x_remove(struct device *dev)
uart_unregister_driver(&s->uart); uart_unregister_driver(&s->uart);
clk_disable_unprepare(s->clk); clk_disable_unprepare(s->clk);
#ifdef CONFIG_GPIOLIB
if (s->gpio_used)
ret = gpiochip_remove(&s->gpio);
#endif
return ret; return ret;
} }

3
include/linux/platform_data/max310x.h
View file

@ -21,7 +21,6 @@
* *
* static struct max310x_pdata max3107_pdata = { * static struct max310x_pdata max3107_pdata = {
* .uart_flags[0] = MAX310X_ECHO_SUPRESS | MAX310X_AUTO_DIR_CTRL, * .uart_flags[0] = MAX310X_ECHO_SUPRESS | MAX310X_AUTO_DIR_CTRL,
* .gpio_base = -1,
* }; * };
* *
* static struct spi_board_info spi_device_max3107[] = { * static struct spi_board_info spi_device_max3107[] = {
@ -45,8 +44,6 @@ struct max310x_pdata {
#define MAX310X_AUTO_DIR_CTRL (0x00000004) /* Enable Auto direction #define MAX310X_AUTO_DIR_CTRL (0x00000004) /* Enable Auto direction
* control (RS-485) * control (RS-485)
*/ */
/* GPIO base number (can be negative) */
const int gpio_base;
}; };
#endif #endif