Skip to content

Commit

Permalink
serial: mctrl-gpio: rename init function
Browse files Browse the repository at this point in the history
This is done before adding more functionality to the init function with
the existing name. As this new functionality conflicts with stuff
drivers are required to implement themselves up to I want to convert
them one by one to make reviewing and reverting more easy in case I
broke something.

Once mctrl_gpio_init is there and all drivers are converted
mctrl_gpio_init_noauto can be removed again.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Oct 4, 2015
1 parent dc2454f commit 7d8c70d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/tty/serial/atmel_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -2692,7 +2692,7 @@ static int atmel_init_gpios(struct atmel_uart_port *p, struct device *dev)
enum mctrl_gpio_idx i;
struct gpio_desc *gpiod;

p->gpios = mctrl_gpio_init(dev, 0);
p->gpios = mctrl_gpio_init_noauto(dev, 0);
if (IS_ERR(p->gpios))
return PTR_ERR(p->gpios);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/clps711x.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ static int uart_clps711x_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, s);

s->gpios = mctrl_gpio_init(&pdev->dev, 0);
s->gpios = mctrl_gpio_init_noauto(&pdev->dev, 0);
if (IS_ERR(s->gpios))
return PTR_ERR(s->gpios);

Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/mxs-auart.c
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ static int mxs_auart_init_gpios(struct mxs_auart_port *s, struct device *dev)
enum mctrl_gpio_idx i;
struct gpio_desc *gpiod;

s->gpios = mctrl_gpio_init(dev, 0);
s->gpios = mctrl_gpio_init_noauto(dev, 0);
if (IS_ERR(s->gpios))
return PTR_ERR(s->gpios);

Expand Down
4 changes: 2 additions & 2 deletions drivers/tty/serial/serial_mctrl_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ unsigned int mctrl_gpio_get(struct mctrl_gpios *gpios, unsigned int *mctrl)
}
EXPORT_SYMBOL_GPL(mctrl_gpio_get);

struct mctrl_gpios *mctrl_gpio_init(struct device *dev, unsigned int idx)
struct mctrl_gpios *mctrl_gpio_init_noauto(struct device *dev, unsigned int idx)
{
struct mctrl_gpios *gpios;
enum mctrl_gpio_idx i;
Expand Down Expand Up @@ -110,7 +110,7 @@ struct mctrl_gpios *mctrl_gpio_init(struct device *dev, unsigned int idx)

return gpios;
}
EXPORT_SYMBOL_GPL(mctrl_gpio_init);
EXPORT_SYMBOL_GPL(mctrl_gpio_init_noauto);

void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios)
{
Expand Down
5 changes: 3 additions & 2 deletions drivers/tty/serial/serial_mctrl_gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ struct gpio_desc *mctrl_gpio_to_gpiod(struct mctrl_gpios *gpios,
* Returns a pointer to the allocated mctrl structure if ok, -ENOMEM on
* allocation error.
*/
struct mctrl_gpios *mctrl_gpio_init(struct device *dev, unsigned int idx);
struct mctrl_gpios *mctrl_gpio_init_noauto(struct device *dev,
unsigned int idx);

/*
* Free the mctrl_gpios structure.
Expand Down Expand Up @@ -95,7 +96,7 @@ struct gpio_desc *mctrl_gpio_to_gpiod(struct mctrl_gpios *gpios,
}

static inline
struct mctrl_gpios *mctrl_gpio_init(struct device *dev, unsigned int idx)
struct mctrl_gpios *mctrl_gpio_init_noauto(struct device *dev, unsigned int idx)
{
return ERR_PTR(-ENOSYS);
}
Expand Down

0 comments on commit 7d8c70d

Please sign in to comment.