Commit ed47941a authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: ssbi-mpp: use gpiochip data pointer 



This makes the driver use the data pointer added to the gpio_chip
to store a pointer to the state container instead of relying on
container_of().

Cc: Björn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 064761d1

drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c

+7 −7
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static struct pinctrl_desc pm8xxx_pinctrl_desc = { 
static int pm8xxx_mpp_direction_input(struct gpio_chip *chip,

				       unsigned offset)

{

	struct pm8xxx_mpp *pctrl = container_of(chip, struct pm8xxx_mpp, chip);

	struct pm8xxx_mpp *pctrl = gpiochip_get_data(chip);

	struct pm8xxx_pin_data *pin = pctrl->desc.pins[offset].drv_data;



	switch (pin->mode) {
@@ -472,7 +472,7 @@ static int pm8xxx_mpp_direction_output(struct gpio_chip *chip, 
					unsigned offset,

					int value)

{

	struct pm8xxx_mpp *pctrl = container_of(chip, struct pm8xxx_mpp, chip);

	struct pm8xxx_mpp *pctrl = gpiochip_get_data(chip);

	struct pm8xxx_pin_data *pin = pctrl->desc.pins[offset].drv_data;



	switch (pin->mode) {
@@ -496,7 +496,7 @@ static int pm8xxx_mpp_direction_output(struct gpio_chip *chip, 


static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset)

{

	struct pm8xxx_mpp *pctrl = container_of(chip, struct pm8xxx_mpp, chip);

	struct pm8xxx_mpp *pctrl = gpiochip_get_data(chip);

	struct pm8xxx_pin_data *pin = pctrl->desc.pins[offset].drv_data;

	bool state;

	int ret;
@@ -513,7 +513,7 @@ static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset) 


static void pm8xxx_mpp_set(struct gpio_chip *chip, unsigned offset, int value)

{

	struct pm8xxx_mpp *pctrl = container_of(chip, struct pm8xxx_mpp, chip);

	struct pm8xxx_mpp *pctrl = gpiochip_get_data(chip);

	struct pm8xxx_pin_data *pin = pctrl->desc.pins[offset].drv_data;



	pin->output_value = !!value;
@@ -537,7 +537,7 @@ static int pm8xxx_mpp_of_xlate(struct gpio_chip *chip, 


static int pm8xxx_mpp_to_irq(struct gpio_chip *chip, unsigned offset)

{

	struct pm8xxx_mpp *pctrl = container_of(chip, struct pm8xxx_mpp, chip);

	struct pm8xxx_mpp *pctrl = gpiochip_get_data(chip);

	struct pm8xxx_pin_data *pin = pctrl->desc.pins[offset].drv_data;



	return pin->irq;
@@ -552,7 +552,7 @@ static void pm8xxx_mpp_dbg_show_one(struct seq_file *s, 
				  unsigned offset,

				  unsigned gpio)

{

	struct pm8xxx_mpp *pctrl = container_of(chip, struct pm8xxx_mpp, chip);

	struct pm8xxx_mpp *pctrl = gpiochip_get_data(chip);

	struct pm8xxx_pin_data *pin = pctrl->desc.pins[offset].drv_data;



	static const char * const aout_lvls[] = {
@@ -826,7 +826,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev) 
	pctrl->chip.of_gpio_n_cells = 2;

	pctrl->chip.label = dev_name(pctrl->dev);

	pctrl->chip.ngpio = pctrl->npins;

	ret = gpiochip_add(&pctrl->chip);

	ret = gpiochip_add_data(&pctrl->chip, pctrl);

	if (ret) {

		dev_err(&pdev->dev, "failed register gpiochip\n");

		goto unregister_pinctrl;

CRA Git | Maintained and supported by SUSTech CRA and CCSE