2015-12-30 14:17:54

by Geliang Tang

[permalink] [raw]
Subject: [PATCH 1/2] irqchip: zevio: use irq_data_get_chip_type

Use irq_data_get_chip_type() instead of container_of().

Signed-off-by: Geliang Tang <[email protected]>
---
drivers/irqchip/irq-zevio.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-zevio.c b/drivers/irqchip/irq-zevio.c
index 4c48fa8..cb9d8ec 100644
--- a/drivers/irqchip/irq-zevio.c
+++ b/drivers/irqchip/irq-zevio.c
@@ -43,8 +43,7 @@ static void __iomem *zevio_irq_io;
static void zevio_irq_ack(struct irq_data *irqd)
{
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(irqd);
- struct irq_chip_regs *regs =
- &container_of(irqd->chip, struct irq_chip_type, chip)->regs;
+ struct irq_chip_regs *regs = &irq_data_get_chip_type(irqd)->regs;

readl(gc->reg_base + regs->ack);
}
--
2.5.0


2015-12-30 14:17:36

by Geliang Tang

[permalink] [raw]
Subject: [PATCH 2/2] gpio: davinci: use irq_data_get_chip_type

Use irq_data_get_chip_type() instead of container_of().

Signed-off-by: Geliang Tang <[email protected]>
---
drivers/gpio/gpio-davinci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 65ebaef..aaa1a249 100644
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -435,8 +435,7 @@ static struct irq_chip *davinci_gpio_get_irq_chip(unsigned int irq)
{
static struct irq_chip_type gpio_unbanked;

- gpio_unbanked = *container_of(irq_get_chip(irq),
- struct irq_chip_type, chip);
+ gpio_unbanked = *irq_data_get_chip_type(irq_get_irq_data(irq));

return &gpio_unbanked.chip;
};
--
2.5.0

Subject: [tip:irq/core] irqchip/zevio: Use irq_data_get_chip_type() helper

Commit-ID: 1fd9a71076ccbcf731cf02408122600a6f2b5d17
Gitweb: http://git.kernel.org/tip/1fd9a71076ccbcf731cf02408122600a6f2b5d17
Author: Geliang Tang <[email protected]>
AuthorDate: Wed, 30 Dec 2015 22:16:37 +0800
Committer: Thomas Gleixner <[email protected]>
CommitDate: Wed, 30 Dec 2015 18:29:02 +0100

irqchip/zevio: Use irq_data_get_chip_type() helper

Use irq_data_get_chip_type() instead of container_of().

Signed-off-by: Geliang Tang <[email protected]>
Cc: Jason Cooper <[email protected]>
Cc: Marc Zyngier <[email protected]>
Link: http://lkml.kernel.org/r/4cc3a3a7a74c7a1894892a85aa7eabbd1534fe96.1451484758.git.geliangtang@163.com
Signed-off-by: Thomas Gleixner <[email protected]>
---
drivers/irqchip/irq-zevio.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-zevio.c b/drivers/irqchip/irq-zevio.c
index 4c48fa8..cb9d8ec 100644
--- a/drivers/irqchip/irq-zevio.c
+++ b/drivers/irqchip/irq-zevio.c
@@ -43,8 +43,7 @@ static void __iomem *zevio_irq_io;
static void zevio_irq_ack(struct irq_data *irqd)
{
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(irqd);
- struct irq_chip_regs *regs =
- &container_of(irqd->chip, struct irq_chip_type, chip)->regs;
+ struct irq_chip_regs *regs = &irq_data_get_chip_type(irqd)->regs;

readl(gc->reg_base + regs->ack);
}