Re: [PATCH] thunderbolt: rename shadowed variables bit to interrupt_bit and auto_clear_bit

From: Mika Westerberg
Date: Mon Mar 20 2023 - 03:43:02 EST


On Sat, Mar 18, 2023 at 08:33:58PM -0500, Mario Limonciello wrote:
>
> On 3/16/23 05:37, Mika Westerberg wrote:
> > On Thu, Mar 16, 2023 at 12:20:48PM +0200, Mika Westerberg wrote:
> > > +Cc Mario
> > >
> > > On Wed, Mar 15, 2023 at 06:04:50PM -0400, Tom Rix wrote:
> > > > cppcheck reports
> > > > drivers/thunderbolt/nhi.c:74:7: style: Local variable 'bit' shadows outer variable [shadowVariable]
> > > > int bit;
> > > > ^
> > > > drivers/thunderbolt/nhi.c:66:6: note: Shadowed declaration
> > > > int bit = ring_interrupt_index(ring) & 31;
> > > > ^
> > > > drivers/thunderbolt/nhi.c:74:7: note: Shadow variable
> > > > int bit;
> > > > ^
> > > > For readablity rename the outer to interrupt_bit and the innner
> > > > to auto_clear_bit.
> > > Thanks for the patch! Yeah, this did not show up in any of the kbuild
> > > tests perhaps they are missing cppcheck :(
> > >
> > > I'm thinking that I'll just move the two commits from "fixes" to "next"
> > > and add this one on top (and drop the stable tags) as the code that we
> > > should be sending to stable should not need additional fixes IMHO. I
> > > know Mario is on vacation so probably cannot answer here so let's deal
> > > with this when he is back.
> > Applied to thunderbolt.git/next (along with the two commits from Mario).
>
> Thanks for the fix Tom!
>
> Mika - It's unfortunate that a fixup was needed but I'd still like if we
> can get these 3 commits into 6.3-rc and also to stable.

Fair enough. I moved them into fixes now.