From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kukjin Kim Subject: RE: [PATCH 2/3] ARM: S3C64XX: Convert S3C64xx irq-eint to use new irq_ methods Date: Wed, 01 Dec 2010 20:30:38 +0900 Message-ID: <003001cb914b$2fa10e90$8ee32bb0$%kim@samsung.com> References: <1290698309-7691-1-git-send-email-broonie@opensource.wolfsonmicro.com> <1290698309-7691-2-git-send-email-broonie@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Return-path: Received: from mailout1.samsung.com ([203.254.224.24]:43507 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308Ab0LALaw (ORCPT ); Wed, 1 Dec 2010 06:30:52 -0500 Received: from epmmp1 (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LCQ00ITNYNFJ840@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 01 Dec 2010 20:30:51 +0900 (KST) Received: from DOKGENEKIM02 ([12.23.103.104]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LCQ00K1UYNFTS@mmp1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 01 Dec 2010 20:30:51 +0900 (KST) In-reply-to: <1290698309-7691-2-git-send-email-broonie@opensource.wolfsonmicro.com> Content-language: ko Sender: linux-samsung-soc-owner@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org To: 'Mark Brown' , 'Ben Dooks' Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, patches@opensource.wolfsonmicro.com Mark Brown wrote: > > Kernel 2.6.37 adds new interrupt methods which take a struct irq_data > rather than an irq number. Conver S3C64xx irq-eint to use this with a > simple textual substitution. > > Signed-off-by: Mark Brown > --- > arch/arm/mach-s3c64xx/irq-eint.c | 32 ++++++++++++++++---------------- > 1 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/irq-eint.c b/arch/arm/mach-s3c64xx/irq- > eint.c > index 1a1aa5d..169ee29 100644 > --- a/arch/arm/mach-s3c64xx/irq-eint.c > +++ b/arch/arm/mach-s3c64xx/irq-eint.c > @@ -32,39 +32,39 @@ > #define eint_offset(irq) ((irq) - IRQ_EINT(0)) > #define eint_irq_to_bit(irq) (1 << eint_offset(irq)) > > -static inline void s3c_irq_eint_mask(unsigned int irq) > +static inline void s3c_irq_eint_mask(struct irq_data *data) > { > u32 mask; > > mask = __raw_readl(S3C64XX_EINT0MASK); > - mask |= eint_irq_to_bit(irq); > + mask |= eint_irq_to_bit(data->irq); > __raw_writel(mask, S3C64XX_EINT0MASK); > } > > -static void s3c_irq_eint_unmask(unsigned int irq) > +static void s3c_irq_eint_unmask(struct irq_data *data) > { > u32 mask; > > mask = __raw_readl(S3C64XX_EINT0MASK); > - mask &= ~eint_irq_to_bit(irq); > + mask &= ~eint_irq_to_bit(data->irq); > __raw_writel(mask, S3C64XX_EINT0MASK); > } > > -static inline void s3c_irq_eint_ack(unsigned int irq) > +static inline void s3c_irq_eint_ack(struct irq_data *data) > { > - __raw_writel(eint_irq_to_bit(irq), S3C64XX_EINT0PEND); > + __raw_writel(eint_irq_to_bit(data->irq), S3C64XX_EINT0PEND); > } > > -static void s3c_irq_eint_maskack(unsigned int irq) > +static void s3c_irq_eint_maskack(struct irq_data *data) > { > /* compiler should in-line these */ > - s3c_irq_eint_mask(irq); > - s3c_irq_eint_ack(irq); > + s3c_irq_eint_mask(data); > + s3c_irq_eint_ack(data); > } > > -static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type) > +static int s3c_irq_eint_set_type(struct irq_data *data, unsigned int type) > { > - int offs = eint_offset(irq); > + int offs = eint_offset(data->irq); > int pin, pin_val; > int shift; > u32 ctrl, mask; > @@ -140,11 +140,11 @@ static int s3c_irq_eint_set_type(unsigned int irq, > unsigned int type) > > static struct irq_chip s3c_irq_eint = { > .name = "s3c-eint", > - .mask = s3c_irq_eint_mask, > - .unmask = s3c_irq_eint_unmask, > - .mask_ack = s3c_irq_eint_maskack, > - .ack = s3c_irq_eint_ack, > - .set_type = s3c_irq_eint_set_type, > + .irq_mask = s3c_irq_eint_mask, > + .irq_unmask = s3c_irq_eint_unmask, > + .irq_mask_ack = s3c_irq_eint_maskack, > + .irq_ack = s3c_irq_eint_ack, > + .irq_set_type = s3c_irq_eint_set_type, > .irq_set_wake = s3c_irqext_wake, > }; > > -- Ok...will apply. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. From mboxrd@z Thu Jan 1 00:00:00 1970 From: kgene.kim@samsung.com (Kukjin Kim) Date: Wed, 01 Dec 2010 20:30:38 +0900 Subject: [PATCH 2/3] ARM: S3C64XX: Convert S3C64xx irq-eint to use new irq_ methods In-Reply-To: <1290698309-7691-2-git-send-email-broonie@opensource.wolfsonmicro.com> References: <1290698309-7691-1-git-send-email-broonie@opensource.wolfsonmicro.com> <1290698309-7691-2-git-send-email-broonie@opensource.wolfsonmicro.com> Message-ID: <003001cb914b$2fa10e90$8ee32bb0$%kim@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Mark Brown wrote: > > Kernel 2.6.37 adds new interrupt methods which take a struct irq_data > rather than an irq number. Conver S3C64xx irq-eint to use this with a > simple textual substitution. > > Signed-off-by: Mark Brown > --- > arch/arm/mach-s3c64xx/irq-eint.c | 32 ++++++++++++++++---------------- > 1 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/irq-eint.c b/arch/arm/mach-s3c64xx/irq- > eint.c > index 1a1aa5d..169ee29 100644 > --- a/arch/arm/mach-s3c64xx/irq-eint.c > +++ b/arch/arm/mach-s3c64xx/irq-eint.c > @@ -32,39 +32,39 @@ > #define eint_offset(irq) ((irq) - IRQ_EINT(0)) > #define eint_irq_to_bit(irq) (1 << eint_offset(irq)) > > -static inline void s3c_irq_eint_mask(unsigned int irq) > +static inline void s3c_irq_eint_mask(struct irq_data *data) > { > u32 mask; > > mask = __raw_readl(S3C64XX_EINT0MASK); > - mask |= eint_irq_to_bit(irq); > + mask |= eint_irq_to_bit(data->irq); > __raw_writel(mask, S3C64XX_EINT0MASK); > } > > -static void s3c_irq_eint_unmask(unsigned int irq) > +static void s3c_irq_eint_unmask(struct irq_data *data) > { > u32 mask; > > mask = __raw_readl(S3C64XX_EINT0MASK); > - mask &= ~eint_irq_to_bit(irq); > + mask &= ~eint_irq_to_bit(data->irq); > __raw_writel(mask, S3C64XX_EINT0MASK); > } > > -static inline void s3c_irq_eint_ack(unsigned int irq) > +static inline void s3c_irq_eint_ack(struct irq_data *data) > { > - __raw_writel(eint_irq_to_bit(irq), S3C64XX_EINT0PEND); > + __raw_writel(eint_irq_to_bit(data->irq), S3C64XX_EINT0PEND); > } > > -static void s3c_irq_eint_maskack(unsigned int irq) > +static void s3c_irq_eint_maskack(struct irq_data *data) > { > /* compiler should in-line these */ > - s3c_irq_eint_mask(irq); > - s3c_irq_eint_ack(irq); > + s3c_irq_eint_mask(data); > + s3c_irq_eint_ack(data); > } > > -static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type) > +static int s3c_irq_eint_set_type(struct irq_data *data, unsigned int type) > { > - int offs = eint_offset(irq); > + int offs = eint_offset(data->irq); > int pin, pin_val; > int shift; > u32 ctrl, mask; > @@ -140,11 +140,11 @@ static int s3c_irq_eint_set_type(unsigned int irq, > unsigned int type) > > static struct irq_chip s3c_irq_eint = { > .name = "s3c-eint", > - .mask = s3c_irq_eint_mask, > - .unmask = s3c_irq_eint_unmask, > - .mask_ack = s3c_irq_eint_maskack, > - .ack = s3c_irq_eint_ack, > - .set_type = s3c_irq_eint_set_type, > + .irq_mask = s3c_irq_eint_mask, > + .irq_unmask = s3c_irq_eint_unmask, > + .irq_mask_ack = s3c_irq_eint_maskack, > + .irq_ack = s3c_irq_eint_ack, > + .irq_set_type = s3c_irq_eint_set_type, > .irq_set_wake = s3c_irqext_wake, > }; > > -- Ok...will apply. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.