Re: [patch 7/9] mfd: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc

[Lee Jones <lee.jones@linaro.org>]

On Mon, 13 Jul 2015, Thomas Gleixner wrote:

> From: Jiang Liu <jiang.liu@linux.intel.com>
> 
> Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we
> already have a pointer to corresponding irq_desc.
> 
> Do the same change to avoid the pattern "irq_get_chip_data(data->irq)".
> 
> Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
>  drivers/mfd/ezx-pcap.c    |    2 +-
>  drivers/mfd/max8997-irq.c |    8 ++++----
>  drivers/mfd/mt6397-core.c |    8 ++++----
>  drivers/mfd/t7l66xb.c     |    2 +-
>  drivers/mfd/tc6393xb.c    |    2 +-
>  drivers/mfd/twl6030-irq.c |    2 +-
>  6 files changed, 12 insertions(+), 12 deletions(-)

Applied, thanks.

> Index: tip/drivers/mfd/ezx-pcap.c
> ===================================================================
> --- tip.orig/drivers/mfd/ezx-pcap.c
> +++ tip/drivers/mfd/ezx-pcap.c
> @@ -207,7 +207,7 @@ static void pcap_isr_work(struct work_st
>  
>  static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
>  {
> -	struct pcap_chip *pcap = irq_get_handler_data(irq);
> +	struct pcap_chip *pcap = irq_desc_get_handler_data(desc);
>  
>  	desc->irq_data.chip->irq_ack(&desc->irq_data);
>  	queue_work(pcap->workqueue, &pcap->isr_work);
> Index: tip/drivers/mfd/max8997-irq.c
> ===================================================================
> --- tip.orig/drivers/mfd/max8997-irq.c
> +++ tip/drivers/mfd/max8997-irq.c
> @@ -113,14 +113,14 @@ static const struct max8997_irq_data max
>  
>  static void max8997_irq_lock(struct irq_data *data)
>  {
> -	struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
> +	struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
>  
>  	mutex_lock(&max8997->irqlock);
>  }
>  
>  static void max8997_irq_sync_unlock(struct irq_data *data)
>  {
> -	struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
> +	struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
>  	int i;
>  
>  	for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++) {
> @@ -148,7 +148,7 @@ irq_to_max8997_irq(struct max8997_dev *m
>  
>  static void max8997_irq_mask(struct irq_data *data)
>  {
> -	struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
> +	struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
>  	const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997,
>  								data->irq);
>  
> @@ -157,7 +157,7 @@ static void max8997_irq_mask(struct irq_
>  
>  static void max8997_irq_unmask(struct irq_data *data)
>  {
> -	struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
> +	struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
>  	const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997,
>  								data->irq);
>  
> Index: tip/drivers/mfd/mt6397-core.c
> ===================================================================
> --- tip.orig/drivers/mfd/mt6397-core.c
> +++ tip/drivers/mfd/mt6397-core.c
> @@ -60,14 +60,14 @@ static const struct mfd_cell mt6397_devs
>  
>  static void mt6397_irq_lock(struct irq_data *data)
>  {
> -	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
> +	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
>  
>  	mutex_lock(&mt6397->irqlock);
>  }
>  
>  static void mt6397_irq_sync_unlock(struct irq_data *data)
>  {
> -	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
> +	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
>  
>  	regmap_write(mt6397->regmap, MT6397_INT_CON0, mt6397->irq_masks_cur[0]);
>  	regmap_write(mt6397->regmap, MT6397_INT_CON1, mt6397->irq_masks_cur[1]);
> @@ -77,7 +77,7 @@ static void mt6397_irq_sync_unlock(struc
>  
>  static void mt6397_irq_disable(struct irq_data *data)
>  {
> -	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
> +	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
>  	int shift = data->hwirq & 0xf;
>  	int reg = data->hwirq >> 4;
>  
> @@ -86,7 +86,7 @@ static void mt6397_irq_disable(struct ir
>  
>  static void mt6397_irq_enable(struct irq_data *data)
>  {
> -	struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
> +	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
>  	int shift = data->hwirq & 0xf;
>  	int reg = data->hwirq >> 4;
>  
> Index: tip/drivers/mfd/t7l66xb.c
> ===================================================================
> --- tip.orig/drivers/mfd/t7l66xb.c
> +++ tip/drivers/mfd/t7l66xb.c
> @@ -187,7 +187,7 @@ static struct mfd_cell t7l66xb_cells[] =
>  /* Handle the T7L66XB interrupt mux */
>  static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)
>  {
> -	struct t7l66xb *t7l66xb = irq_get_handler_data(irq);
> +	struct t7l66xb *t7l66xb = irq_desc_get_handler_data(desc);
>  	unsigned int isr;
>  	unsigned int i, irq_base;
>  
> Index: tip/drivers/mfd/tc6393xb.c
> ===================================================================
> --- tip.orig/drivers/mfd/tc6393xb.c
> +++ tip/drivers/mfd/tc6393xb.c
> @@ -525,7 +525,7 @@ static int tc6393xb_register_gpio(struct
>  static void
>  tc6393xb_irq(unsigned int irq, struct irq_desc *desc)
>  {
> -	struct tc6393xb *tc6393xb = irq_get_handler_data(irq);
> +	struct tc6393xb *tc6393xb = irq_desc_get_handler_data(desc);
>  	unsigned int isr;
>  	unsigned int i, irq_base;
>  
> Index: tip/drivers/mfd/twl6030-irq.c
> ===================================================================
> --- tip.orig/drivers/mfd/twl6030-irq.c
> +++ tip/drivers/mfd/twl6030-irq.c
> @@ -231,7 +231,7 @@ static irqreturn_t twl6030_irq_thread(in
>  
>  static int twl6030_irq_set_wake(struct irq_data *d, unsigned int on)
>  {
> -	struct twl6030_irq *pdata = irq_get_chip_data(d->irq);
> +	struct twl6030_irq *pdata = irq_data_get_irq_chip_data(d);
>  
>  	if (on)
>  		atomic_inc(&pdata->wakeirqs);
> 
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog