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

pinctrl: msm: 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: Stephen Boyd <sboyd@codeaurora.org>
Cc: Björn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2e862a7b

drivers/pinctrl/qcom/pinctrl-msm.c

+12 −17
Original line number Original line Diff line number Diff line
@@ -69,11 +69,6 @@ struct msm_pinctrl { 
	void __iomem *regs;

	void __iomem *regs;

};

};





static inline struct msm_pinctrl *to_msm_pinctrl(struct gpio_chip *gc)

{

	return container_of(gc, struct msm_pinctrl, chip);

}



static int msm_get_groups_count(struct pinctrl_dev *pctldev)

static int msm_get_groups_count(struct pinctrl_dev *pctldev)

{

{

	struct msm_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);

	struct msm_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
@@ -381,7 +376,7 @@ static struct pinctrl_desc msm_pinctrl_desc = { 
static int msm_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

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

{

{

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

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

	struct msm_pinctrl *pctrl = gpiochip_get_data(chip);

	unsigned long flags;

	unsigned long flags;

	u32 val;

	u32 val;
@@ -401,7 +396,7 @@ static int msm_gpio_direction_input(struct gpio_chip *chip, unsigned offset) 
static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value)

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

{

{

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

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

	struct msm_pinctrl *pctrl = gpiochip_get_data(chip);

	unsigned long flags;

	unsigned long flags;

	u32 val;

	u32 val;
@@ -428,7 +423,7 @@ static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, in 
static int msm_gpio_get(struct gpio_chip *chip, unsigned offset)

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

{

{

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

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

	struct msm_pinctrl *pctrl = gpiochip_get_data(chip);

	u32 val;

	u32 val;





	g = &pctrl->soc->groups[offset];

	g = &pctrl->soc->groups[offset];
@@ -440,7 +435,7 @@ static int msm_gpio_get(struct gpio_chip *chip, unsigned offset) 
static void msm_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

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

{

{

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

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

	struct msm_pinctrl *pctrl = gpiochip_get_data(chip);

	unsigned long flags;

	unsigned long flags;

	u32 val;

	u32 val;
@@ -468,7 +463,7 @@ static void msm_gpio_dbg_show_one(struct seq_file *s, 
				  unsigned gpio)

				  unsigned gpio)

{

{

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

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

	struct msm_pinctrl *pctrl = gpiochip_get_data(chip);

	unsigned func;

	unsigned func;

	int is_out;

	int is_out;

	int drive;

	int drive;
@@ -567,7 +562,7 @@ static void msm_gpio_update_dual_edge_pos(struct msm_pinctrl *pctrl, 
static void msm_gpio_irq_mask(struct irq_data *d)

static void msm_gpio_irq_mask(struct irq_data *d)

{

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct msm_pinctrl *pctrl = to_msm_pinctrl(gc);

	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

	unsigned long flags;

	unsigned long flags;

	u32 val;

	u32 val;
@@ -588,7 +583,7 @@ static void msm_gpio_irq_mask(struct irq_data *d) 
static void msm_gpio_irq_unmask(struct irq_data *d)

static void msm_gpio_irq_unmask(struct irq_data *d)

{

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct msm_pinctrl *pctrl = to_msm_pinctrl(gc);

	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

	unsigned long flags;

	unsigned long flags;

	u32 val;

	u32 val;
@@ -613,7 +608,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d) 
static void msm_gpio_irq_ack(struct irq_data *d)

static void msm_gpio_irq_ack(struct irq_data *d)

{

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct msm_pinctrl *pctrl = to_msm_pinctrl(gc);

	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

	unsigned long flags;

	unsigned long flags;

	u32 val;

	u32 val;
@@ -638,7 +633,7 @@ static void msm_gpio_irq_ack(struct irq_data *d) 
static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)

static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)

{

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct msm_pinctrl *pctrl = to_msm_pinctrl(gc);

	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

	unsigned long flags;

	unsigned long flags;

	u32 val;

	u32 val;
@@ -732,7 +727,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)

static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)

{

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct msm_pinctrl *pctrl = to_msm_pinctrl(gc);

	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&pctrl->lock, flags);

	spin_lock_irqsave(&pctrl->lock, flags);
@@ -757,7 +752,7 @@ static void msm_gpio_irq_handler(struct irq_desc *desc) 
{

{

	struct gpio_chip *gc = irq_desc_get_handler_data(desc);

	struct gpio_chip *gc = irq_desc_get_handler_data(desc);

	const struct msm_pingroup *g;

	const struct msm_pingroup *g;

	struct msm_pinctrl *pctrl = to_msm_pinctrl(gc);

	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct irq_chip *chip = irq_desc_get_chip(desc);

	int irq_pin;

	int irq_pin;

	int handled = 0;

	int handled = 0;
@@ -804,7 +799,7 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) 
	chip->owner = THIS_MODULE;

	chip->owner = THIS_MODULE;

	chip->of_node = pctrl->dev->of_node;

	chip->of_node = pctrl->dev->of_node;





	ret = gpiochip_add(&pctrl->chip);

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

	if (ret) {

	if (ret) {

		dev_err(pctrl->dev, "Failed register gpiochip\n");

		dev_err(pctrl->dev, "Failed register gpiochip\n");

		return ret;

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE