From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grygorii Strashko Subject: Re: [4.2-rc1][PATCH] gpio: omap: add missed spin_unlock_irqrestore in omap_gpio_irq_type Date: Fri, 7 Aug 2015 10:34:44 +0300 Message-ID: <55C45F94.50000@ti.com> References: <1435157657-17843-1-git-send-email-grygorii.strashko@ti.com> <20150807033642.GI4215@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20150807033642.GI4215@atomide.com> Sender: linux-kernel-owner@vger.kernel.org To: Tony Lindgren , Linus Walleij Cc: Alexandre Courbot , Sekhar Nori , Javier Martinez Canillas , Linux-OMAP , "linux-gpio@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Grygorii Strashko , Sebastian Andrzej Siewior List-Id: linux-gpio@vger.kernel.org Hi Tony, On 08/07/2015 06:36 AM, Tony Lindgren wrote: > * Linus Walleij [150716 01:38]: >> On Wed, Jun 24, 2015 at 4:54 PM, Grygorii Strashko >> wrote: >> >>> From: Grygorii Strashko >>> >>> Add missed spin_unlock_irqrestore in omap_gpio_irq_type when >>> omap_set_gpio_triggering() is failed. >>> >>> It fixes static checker warning: >>> >>> drivers/gpio/gpio-omap.c:523 omap_gpio_irq_type() >>> warn: inconsistent returns 'spin_lock:&bank->lock'. >>> >>> This fixes commit: >>> 1562e4618ded ('gpio: omap: fix error handling in omap_gpio_irq_type= ') >>> >>> Reported-by: Javier Martinez Canillas >>> Signed-off-by: Grygorii Strashko >> >> Patch applied for fixes. > > Linus, looks like we now have a new build warning in Linux next > with the fixes and raw_spinlock_t change, so a merge or a commit > is needed. If you prefer a patch, here's one below. Yes. It seems merge/rebase issue between fixes & next: - this patch went through fixes and RAW spinlock conversation patch through -next, and without merge conflicts. and patch has been posted already by Axel Lin: http://www.spinics.net/lists/linux-omap/msg121031.html > > 8< --------------- > From: Tony Lindgren > Date: Thu, 6 Aug 2015 20:32:24 -0700 > Subject: [PATCH] gpio: omap: Fix build warning for raw_spinlock_t con= version > and unlock fix > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > Looks like we now have a new build warning in Linux next with fix > 977bd8a94c40 ("gpio: omap: add missed spin_unlock_irqrestore in > omap_gpio_irq_type") and raw_spinlock changes done in commit > 4dbada2be460 ("gpio: omap: use raw locks for locking"): > > drivers/gpio/gpio-omap.c: In function =E2=80=98omap_gpio_irq_type=E2=80= =99: > drivers/gpio/gpio-omap.c:504:26: warning: passing argument 1 of > =E2=80=98spin_unlock_irqrestore=E2=80=99 from incompatible pointer ty= pe > [-Wincompatible-pointer-types] > spin_unlock_irqrestore(&bank->lock, flags); > ^ > In file included from include/linux/seqlock.h:35:0, > from include/linux/time.h:5, > from include/linux/stat.h:18, > from include/linux/module.h:10, > from drivers/gpio/gpio-omap.c:16: > include/linux/spinlock.h:370:122: note: expected > =E2=80=98spinlock_t * {aka struct spinlock *}=E2=80=99 but argument i= s of type > =E2=80=98raw_spinlock_t * {aka struct raw_spinlock *}=E2=80=99 > > Fix the issue with using raw_spinlock_t instead. > > Signed-off-by: Tony Lindgren > > --- a/drivers/gpio/gpio-omap.c > +++ b/drivers/gpio/gpio-omap.c > @@ -501,7 +501,7 @@ static int omap_gpio_irq_type(struct irq_data *d,= unsigned type) > raw_spin_lock_irqsave(&bank->lock, flags); > retval =3D omap_set_gpio_triggering(bank, offset, type); > if (retval) { > - spin_unlock_irqrestore(&bank->lock, flags); > + raw_spin_unlock_irqrestore(&bank->lock, flags); > goto error; > } > omap_gpio_init_irq(bank, offset); > -- > To unsubscribe from this list: send the line "unsubscribe linux-gpio"= in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > --=20 regards, -grygorii