Date: Mon, 20 Dec 2010 13:23:44 +0900
From: Paul Mundt <lethal@linux-sh.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Samuel Ortiz <sameo@linux.intel.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Sundar Iyer <sundar.iyer@stericsson.com>,
        Mark Brown <broonie@opensource.wolfsonmicro.com>,
        Linus Walleij <linus.walleij@linaro.org>
Subject: Re: linux-next: manual merge of the mfd tree with the ux500-core tree
Message-ID: <20101220042344.GB10050@linux-sh.org>
References: <20101220152148.6fedee0d.sfr@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20101220152148.6fedee0d.sfr@canb.auug.org.au>
User-Agent: Mutt/1.5.13 (2006-08-11)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1429
Lines: 42

On Mon, Dec 20, 2010 at 03:21:48PM +1100, Stephen Rothwell wrote:
> The genirq core is being converted to pass struct irq_data to irq_chip
> operations rather than an IRQ number. Update the tc35892 driver to the
> new APIs.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Sorry to hijack the thread..

> diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
> index 32291fe..dde2d858 100644
> --- a/drivers/mfd/tc3589x.c
> +++ b/drivers/mfd/tc3589x.c
> @@ -170,15 +170,15 @@ again:
>  	return IRQ_HANDLED;
>  }
>  
> -static void tc3589x_irq_dummy(unsigned int irq)
> +static void tc3589x_irq_dummy(struct irq_data *data)
>  {
>  	/* No mask/unmask at this level */
>  }
>  
>  static struct irq_chip tc3589x_irq_chip = {
> -	.name	= "tc3589x",
> -	.mask	= tc3589x_irq_dummy,
> -	.unmask	= tc3589x_irq_dummy,
> +	.name		= "tc3589x",
> +	.irq_mask	= tc3589x_irq_dummy,
> +	.irq_unmask	= tc3589x_irq_dummy,
>  };
>  
>  static int tc3589x_irq_init(struct tc3589x *tc3589x)

Is there some reason you don't just kill this off and use dummy_irq_chip?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/