xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: sirf-atlas7: use gpiochip data pointer

Browse Source 
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: Barry Song <baohua@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2015-12-08 10:27:16 +01:00
parent 7cb093c4bc
commit 9420023a53
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/pinctrl/sirf/pinctrl-atlas7.c
View File

@@ -355,11 +355,6 @@ struct atlas7_gpio_chip {
struct atlas7_gpio_bank banks[0]; struct atlas7_gpio_bank banks[0];
}; };
static inline struct atlas7_gpio_chip *to_atlas7_gpio(struct gpio_chip *gc)
{
return container_of(gc, struct atlas7_gpio_chip, chip);
}
/** /**
* @dev: a pointer back to containing device * @dev: a pointer back to containing device
* @virtbase: the offset to the controller in virtual memory * @virtbase: the offset to the controller in virtual memory
@@ -5600,7 +5595,7 @@ static int __atlas7_gpio_to_pin(struct atlas7_gpio_chip *a7gc, u32 gpio)
static void atlas7_gpio_irq_ack(struct irq_data *d) static void atlas7_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 atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
struct atlas7_gpio_bank *bank; struct atlas7_gpio_bank *bank;
void __iomem *ctrl_reg; void __iomem *ctrl_reg;
u32 val, pin_in_bank; u32 val, pin_in_bank;
@@ -5638,7 +5633,7 @@ static void __atlas7_gpio_irq_mask(struct atlas7_gpio_chip *a7gc, int idx)
static void atlas7_gpio_irq_mask(struct irq_data *d) static void atlas7_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 atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&a7gc->lock, flags); spin_lock_irqsave(&a7gc->lock, flags);
@@ -5651,7 +5646,7 @@ static void atlas7_gpio_irq_mask(struct irq_data *d)
static void atlas7_gpio_irq_unmask(struct irq_data *d) static void atlas7_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 atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
struct atlas7_gpio_bank *bank; struct atlas7_gpio_bank *bank;
void __iomem *ctrl_reg; void __iomem *ctrl_reg;
u32 val, pin_in_bank; u32 val, pin_in_bank;
@@ -5675,7 +5670,7 @@ static int atlas7_gpio_irq_type(struct irq_data *d,
unsigned int type) 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 atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
struct atlas7_gpio_bank *bank; struct atlas7_gpio_bank *bank;
void __iomem *ctrl_reg; void __iomem *ctrl_reg;
u32 val, pin_in_bank; u32 val, pin_in_bank;
@@ -5744,7 +5739,7 @@ static struct irq_chip atlas7_gpio_irq_chip = {
static void atlas7_gpio_handle_irq(struct irq_desc *desc) static void atlas7_gpio_handle_irq(struct irq_desc *desc)
{ {
struct gpio_chip *gc = irq_desc_get_handler_data(desc); struct gpio_chip *gc = irq_desc_get_handler_data(desc);
struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(gc);
struct atlas7_gpio_bank *bank = NULL; struct atlas7_gpio_bank *bank = NULL;
u32 status, ctrl; u32 status, ctrl;
int pin_in_bank = 0, idx; int pin_in_bank = 0, idx;
@@ -5812,7 +5807,7 @@ static void __atlas7_gpio_set_input(struct atlas7_gpio_chip *a7gc,
static int atlas7_gpio_request(struct gpio_chip *chip, static int atlas7_gpio_request(struct gpio_chip *chip,
unsigned int gpio) unsigned int gpio)
{ {
struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
int ret; int ret;
unsigned long flags; unsigned long flags;
@@ -5840,7 +5835,7 @@ static int atlas7_gpio_request(struct gpio_chip *chip,
static void atlas7_gpio_free(struct gpio_chip *chip, static void atlas7_gpio_free(struct gpio_chip *chip,
unsigned int gpio) unsigned int gpio)
{ {
struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&a7gc->lock, flags); spin_lock_irqsave(&a7gc->lock, flags);
@@ -5856,7 +5851,7 @@ static void atlas7_gpio_free(struct gpio_chip *chip,
static int atlas7_gpio_direction_input(struct gpio_chip *chip, static int atlas7_gpio_direction_input(struct gpio_chip *chip,
unsigned int gpio) unsigned int gpio)
{ {
struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&a7gc->lock, flags); spin_lock_irqsave(&a7gc->lock, flags);
@@ -5893,7 +5888,7 @@ static void __atlas7_gpio_set_output(struct atlas7_gpio_chip *a7gc,
static int atlas7_gpio_direction_output(struct gpio_chip *chip, static int atlas7_gpio_direction_output(struct gpio_chip *chip,
unsigned int gpio, int value) unsigned int gpio, int value)
{ {
struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&a7gc->lock, flags); spin_lock_irqsave(&a7gc->lock, flags);
@@ -5908,7 +5903,7 @@ static int atlas7_gpio_direction_output(struct gpio_chip *chip,
static int atlas7_gpio_get_value(struct gpio_chip *chip, static int atlas7_gpio_get_value(struct gpio_chip *chip,
unsigned int gpio) unsigned int gpio)
{ {
struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
struct atlas7_gpio_bank *bank; struct atlas7_gpio_bank *bank;
u32 val, pin_in_bank; u32 val, pin_in_bank;
unsigned long flags; unsigned long flags;
@@ -5928,7 +5923,7 @@ static int atlas7_gpio_get_value(struct gpio_chip *chip,
static void atlas7_gpio_set_value(struct gpio_chip *chip, static void atlas7_gpio_set_value(struct gpio_chip *chip,
unsigned int gpio, int value) unsigned int gpio, int value)
{ {
struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(chip); struct atlas7_gpio_chip *a7gc = gpiochip_get_data(chip);
struct atlas7_gpio_bank *bank; struct atlas7_gpio_bank *bank;
void __iomem *ctrl_reg; void __iomem *ctrl_reg;
u32 ctrl, pin_in_bank; u32 ctrl, pin_in_bank;
@@ -6015,7 +6010,7 @@ static int atlas7_gpio_probe(struct platform_device *pdev)
chip->parent = &pdev->dev; chip->parent = &pdev->dev;
/* Add gpio chip to system */ /* Add gpio chip to system */
ret = gpiochip_add(chip); ret = gpiochip_add_data(chip, a7gc);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"%s: error in probe function with status %d\n", "%s: error in probe function with status %d\n",