From: b-liu@ti.com (Bin Liu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] usb: musb: constify musb_hdrc_config structures
Date: Thu, 26 Jan 2017 07:31:17 -0600 [thread overview]
Message-ID: <20170126133117.GA21144@uda0271908> (raw)
In-Reply-To: <20170125212409.GC5496@kroah.com>
On Wed, Jan 25, 2017 at 10:24:09PM +0100, Greg KH wrote:
> On Wed, Jan 25, 2017 at 10:58:15AM -0600, Bin Liu wrote:
> > On Wed, Jan 25, 2017 at 12:52:22AM +0530, Bhumika Goyal wrote:
> > > Declare musb_hdrc_config structures as const as they are only stored in
> > > the config field of a musb_hdrc_platform_data structure. This field is of
> > > type const, so musb_hdrc_config structures having this property can be
> > > made const too.
> > > Done using Coccinelle:
> > >
> > > @r disable optional_qualifier@
> > > identifier x;
> > > position p;
> > > @@
> > > static struct musb_hdrc_config x at p={...};
> > >
> > > @ok@
> > > struct musb_hdrc_platform_data pdata;
> > > identifier r.x;
> > > position p;
> > > @@
> > > pdata.config=&x at p;
> > >
> > > @bad@
> > > position p != {r.p,ok.p};
> > > identifier r.x;
> > > @@
> > > x at p
> > >
> > > @depends on !bad disable optional_qualifier@
> > > identifier r.x;
> > > @@
> > > +const
> > > struct musb_hdrc_config x;
> > >
> > > File size before:
> > > text data bss dec hex filename
> > > 1212 338 0 1550 60e drivers/usb/musb/jz4740.o
> > >
> > > File size after:
> > > text data bss dec hex filename
> > > 1268 290 0 1558 616 drivers/usb/musb/jz4740.o
> > >
> > > File size before:
> > > text data bss dec hex filename
> > > 6151 333 16 6500 1964 drivers/usb/musb/sunxi.o
> > >
> > > File size after:
> > > text data bss dec hex filename
> > > 6215 269 16 6500 1964 drivers/usb/musb/sunxi.o
> > >
> > > File size before:
> > > text data bss dec hex filename
> > > 3668 864 0 4532 11b4 drivers/usb/musb/ux500.o
> > >
> > > File size after:
> > > text data bss dec hex filename
> > > 3724 808 0 4532 11b4 drivers/usb/musb/ux500.o
> > >
> > > Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
> >
> > Hi Greg,
> >
> > Why you don't want this patch go through my tree? Now it causes me tree
> > rebase failed. It should be easy to fix, but just wanted to learn your
> > rules.
>
> What are you rebasing? And why? Just send me patches, I can merge them
> when they come in just fine.
I was rebasing my -next branch, which hosts all musb patches for next
merge window, to your usb-next branch. I regularly keep my branches up
to date to ensure the patches I send to you don't cause any surprise.
>
> Normally yes, I do wait for these to go through your tree, but it was
> just so simple, and obvious, and in a bunch of others from the author,
> that I figured I could just take it as-is.
>
> sorry if it caused you problems, but you might want to look at your
It is not a problem at all, the merge conflict is one of the simplest to
fix. I just wanted to learn your maintenance policy, to avoid me cause
any problem to you, as the couple glitches just happened in the past
months.
> development process if it is. You should always be able to handle other
> people changing files in your area at any point in time. Kernel
I understand it is common in kernel development.
> maintainership is not "no one else can ever touch this!" type of
> development, you have to be able to handle stuff like this easily.
I do expect merge conflict. If the $subject patch went through my tree,
the similar merge error could happen too (just in the opposite way). It
was that I was rebasing my branch and about to pick the $subject patch,
and didn't expect this merge conflict in rebase, so asked.
Regards,
-Bin.
WARNING: multiple messages have this Message-ID (diff)
From: Bin Liu <b-liu@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: <julia.lawall@lip6.fr>, <maxime.ripard@free-electrons.com>,
<wens@csie.org>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH] usb: musb: constify musb_hdrc_config structures
Date: Thu, 26 Jan 2017 07:31:17 -0600 [thread overview]
Message-ID: <20170126133117.GA21144@uda0271908> (raw)
In-Reply-To: <20170125212409.GC5496@kroah.com>
On Wed, Jan 25, 2017 at 10:24:09PM +0100, Greg KH wrote:
> On Wed, Jan 25, 2017 at 10:58:15AM -0600, Bin Liu wrote:
> > On Wed, Jan 25, 2017 at 12:52:22AM +0530, Bhumika Goyal wrote:
> > > Declare musb_hdrc_config structures as const as they are only stored in
> > > the config field of a musb_hdrc_platform_data structure. This field is of
> > > type const, so musb_hdrc_config structures having this property can be
> > > made const too.
> > > Done using Coccinelle:
> > >
> > > @r disable optional_qualifier@
> > > identifier x;
> > > position p;
> > > @@
> > > static struct musb_hdrc_config x@p={...};
> > >
> > > @ok@
> > > struct musb_hdrc_platform_data pdata;
> > > identifier r.x;
> > > position p;
> > > @@
> > > pdata.config=&x@p;
> > >
> > > @bad@
> > > position p != {r.p,ok.p};
> > > identifier r.x;
> > > @@
> > > x@p
> > >
> > > @depends on !bad disable optional_qualifier@
> > > identifier r.x;
> > > @@
> > > +const
> > > struct musb_hdrc_config x;
> > >
> > > File size before:
> > > text data bss dec hex filename
> > > 1212 338 0 1550 60e drivers/usb/musb/jz4740.o
> > >
> > > File size after:
> > > text data bss dec hex filename
> > > 1268 290 0 1558 616 drivers/usb/musb/jz4740.o
> > >
> > > File size before:
> > > text data bss dec hex filename
> > > 6151 333 16 6500 1964 drivers/usb/musb/sunxi.o
> > >
> > > File size after:
> > > text data bss dec hex filename
> > > 6215 269 16 6500 1964 drivers/usb/musb/sunxi.o
> > >
> > > File size before:
> > > text data bss dec hex filename
> > > 3668 864 0 4532 11b4 drivers/usb/musb/ux500.o
> > >
> > > File size after:
> > > text data bss dec hex filename
> > > 3724 808 0 4532 11b4 drivers/usb/musb/ux500.o
> > >
> > > Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
> >
> > Hi Greg,
> >
> > Why you don't want this patch go through my tree? Now it causes me tree
> > rebase failed. It should be easy to fix, but just wanted to learn your
> > rules.
>
> What are you rebasing? And why? Just send me patches, I can merge them
> when they come in just fine.
I was rebasing my -next branch, which hosts all musb patches for next
merge window, to your usb-next branch. I regularly keep my branches up
to date to ensure the patches I send to you don't cause any surprise.
>
> Normally yes, I do wait for these to go through your tree, but it was
> just so simple, and obvious, and in a bunch of others from the author,
> that I figured I could just take it as-is.
>
> sorry if it caused you problems, but you might want to look at your
It is not a problem at all, the merge conflict is one of the simplest to
fix. I just wanted to learn your maintenance policy, to avoid me cause
any problem to you, as the couple glitches just happened in the past
months.
> development process if it is. You should always be able to handle other
> people changing files in your area at any point in time. Kernel
I understand it is common in kernel development.
> maintainership is not "no one else can ever touch this!" type of
> development, you have to be able to handle stuff like this easily.
I do expect merge conflict. If the $subject patch went through my tree,
the similar merge error could happen too (just in the opposite way). It
was that I was rebasing my branch and about to pick the $subject patch,
and didn't expect this merge conflict in rebase, so asked.
Regards,
-Bin.
next prev parent reply other threads:[~2017-01-26 13:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 19:22 [PATCH] usb: musb: constify musb_hdrc_config structures Bhumika Goyal
2017-01-24 19:22 ` Bhumika Goyal
2017-01-25 16:58 ` Bin Liu
2017-01-25 16:58 ` Bin Liu
2017-01-25 21:24 ` Greg KH
2017-01-25 21:24 ` Greg KH
2017-01-26 13:31 ` Bin Liu [this message]
2017-01-26 13:31 ` Bin Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170126133117.GA21144@uda0271908 \
--to=b-liu@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.