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

Commit 5c77c021 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: intel-mid: 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: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f372d5f5

drivers/gpio/gpio-intel-mid.c

+7 −12
Original line number Diff line number Diff line
@@ -78,15 +78,10 @@ struct intel_mid_gpio { 
	struct pci_dev			*pdev;

};



static inline struct intel_mid_gpio *to_intel_gpio_priv(struct gpio_chip *gc)

{

	return container_of(gc, struct intel_mid_gpio, chip);

}



static void __iomem *gpio_reg(struct gpio_chip *chip, unsigned offset,

			      enum GPIO_REG reg_type)

{

	struct intel_mid_gpio *priv = to_intel_gpio_priv(chip);

	struct intel_mid_gpio *priv = gpiochip_get_data(chip);

	unsigned nreg = chip->ngpio / 32;

	u8 reg = offset / 32;
@@ -96,7 +91,7 @@ static void __iomem *gpio_reg(struct gpio_chip *chip, unsigned offset, 
static void __iomem *gpio_reg_2bit(struct gpio_chip *chip, unsigned offset,

				   enum GPIO_REG reg_type)

{

	struct intel_mid_gpio *priv = to_intel_gpio_priv(chip);

	struct intel_mid_gpio *priv = gpiochip_get_data(chip);

	unsigned nreg = chip->ngpio / 32;

	u8 reg = offset / 16;
@@ -138,7 +133,7 @@ static void intel_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 


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

{

	struct intel_mid_gpio *priv = to_intel_gpio_priv(chip);

	struct intel_mid_gpio *priv = gpiochip_get_data(chip);

	void __iomem *gpdr = gpio_reg(chip, offset, GPDR);

	u32 value;

	unsigned long flags;
@@ -161,7 +156,7 @@ static int intel_gpio_direction_input(struct gpio_chip *chip, unsigned offset) 
static int intel_gpio_direction_output(struct gpio_chip *chip,

			unsigned offset, int value)

{

	struct intel_mid_gpio *priv = to_intel_gpio_priv(chip);

	struct intel_mid_gpio *priv = gpiochip_get_data(chip);

	void __iomem *gpdr = gpio_reg(chip, offset, GPDR);

	unsigned long flags;
@@ -185,7 +180,7 @@ static int intel_gpio_direction_output(struct gpio_chip *chip, 
static int intel_mid_irq_type(struct irq_data *d, unsigned type)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct intel_mid_gpio *priv = to_intel_gpio_priv(gc);

	struct intel_mid_gpio *priv = gpiochip_get_data(gc);

	u32 gpio = irqd_to_hwirq(d);

	unsigned long flags;

	u32 value;
@@ -304,7 +299,7 @@ MODULE_DEVICE_TABLE(pci, intel_gpio_ids); 
static void intel_mid_irq_handler(struct irq_desc *desc)

{

	struct gpio_chip *gc = irq_desc_get_handler_data(desc);

	struct intel_mid_gpio *priv = to_intel_gpio_priv(gc);

	struct intel_mid_gpio *priv = gpiochip_get_data(gc);

	struct irq_data *data = irq_desc_get_irq_data(desc);

	struct irq_chip *chip = irq_data_get_irq_chip(data);

	u32 base, gpio, mask;
@@ -406,7 +401,7 @@ static int intel_gpio_probe(struct pci_dev *pdev, 
	spin_lock_init(&priv->lock);



	pci_set_drvdata(pdev, priv);

	retval = gpiochip_add(&priv->chip);

	retval = gpiochip_add_data(&priv->chip, priv);

	if (retval) {

		dev_err(&pdev->dev, "gpiochip_add error %d\n", retval);

		return retval;