linux-next: manual merge of the usb tree with the trivial tree

linux-next: manual merge of the usb tree with the trivial tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/langwell_udc.c between commit
7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
unnecessary return's from void functions") from the trivial tree and
commit 0f92bbacd2d1a26e8bf863d2cc05572df43bf7fb ("USB: langwell: USB
Client driver code cleanup") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix
while necessary.  Though, if that trivial tree commit was in the usb tree,
the conflict could be resolved there ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/gadget/langwell_udc.c
index d41b69c,1ef17a6..0000000
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@@ -283,7 -253,8 +253,7 @@@ static void ep0_reset(struct langwell_u
  		ep_reset(&dev->ep[0], 0, i, USB_ENDPOINT_XFER_CONTROL);
  	}
  
- 	VDBG(dev, "<--- %s()\n", __func__);
+ 	dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 -	return;
  }
  
  
@@@ -1484,7 -1501,8 +1500,7 @@@ static void langwell_udc_start(struct l
  	usbcmd |= CMD_RUNSTOP;
  	writel(usbcmd, &dev->op_regs->usbcmd);
  
- 	DBG(dev, "<--- %s()\n", __func__);
+ 	dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 -	return;
  }
  
  
@@@ -1506,7 -1524,8 +1522,7 @@@ static void langwell_udc_stop(struct la
  	usbcmd &= ~CMD_RUNSTOP;
  	writel(usbcmd, &dev->op_regs->usbcmd);
  
- 	DBG(dev, "<--- %s()\n", __func__);
+ 	dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 -	return;
  }
  
  

Re: linux-next: manual merge of the usb tree with the trivial tree

[Greg KH]

On Thu, Sep 02, 2010 at 01:01:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/langwell_udc.c between commit
> 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> unnecessary return's from void functions") from the trivial tree and
> commit 0f92bbacd2d1a26e8bf863d2cc05572df43bf7fb ("USB: langwell: USB
> Client driver code cleanup") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> while necessary.  Though, if that trivial tree commit was in the usb tree,
> the conflict could be resolved there ...

Joe, care to break this one change out and have me take it through the
usb tree?

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with the trivial tree

[Jiri Kosina]

On Wed, 1 Sep 2010, Greg KH wrote:

> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/gadget/langwell_udc.c between commit
> > 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> > unnecessary return's from void functions") from the trivial tree and
> > commit 0f92bbacd2d1a26e8bf863d2cc05572df43bf7fb ("USB: langwell: USB
> > Client driver code cleanup") from the usb tree.
> > 
> > Just context changes.  I fixed it up (see below) and can carry the fix
> > while necessary.  Though, if that trivial tree commit was in the usb tree,
> > the conflict could be resolved there ...
> 
> Joe, care to break this one change out and have me take it through the
> usb tree?

Here it goes. I will revert this chunk in trivial tree for now.


From: Joe Perches <joe@perches.com>
Subject: drivers/usb: langwell: Remove unnecessary return's from void functions

There are about 2500 void functions in drivers/usb
Only a few used return; at end of function.

Standardize them a bit.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index a391351..f1a0702 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -284,7 +284,6 @@ static void ep0_reset(struct langwell_udc *dev)
 	}
 
 	VDBG(dev, "<--- %s()\n", __func__);
-	return;
 }
 
 
@@ -1486,7 +1485,6 @@ static void langwell_udc_start(struct langwell_udc *dev)
 	writel(usbcmd, &dev->op_regs->usbcmd);
 
 	DBG(dev, "<--- %s()\n", __func__);
-	return;
 }
 
 
@@ -1509,7 +1507,6 @@ static void langwell_udc_stop(struct langwell_udc *dev)
 	writel(usbcmd, &dev->op_regs->usbcmd);
 
 	DBG(dev, "<--- %s()\n", __func__);
-	return;
 }
 
 

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: linux-next: manual merge of the usb tree with the trivial tree

[Greg KH]

On Thu, Sep 02, 2010 at 04:34:36PM +0200, Jiri Kosina wrote:
> On Wed, 1 Sep 2010, Greg KH wrote:
> 
> > > Today's linux-next merge of the usb tree got a conflict in
> > > drivers/usb/gadget/langwell_udc.c between commit
> > > 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> > > unnecessary return's from void functions") from the trivial tree and
> > > commit 0f92bbacd2d1a26e8bf863d2cc05572df43bf7fb ("USB: langwell: USB
> > > Client driver code cleanup") from the usb tree.
> > > 
> > > Just context changes.  I fixed it up (see below) and can carry the fix
> > > while necessary.  Though, if that trivial tree commit was in the usb tree,
> > > the conflict could be resolved there ...
> > 
> > Joe, care to break this one change out and have me take it through the
> > usb tree?
> 
> Here it goes. I will revert this chunk in trivial tree for now.

Thanks, I've applied it to my tree now.

greg k-h

linux-next: manual merge of the usb tree with the trivial tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/rndis.c between commit
7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
unnecessary return's from void functions") from the trivial tree and
commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget: rndis: fix
up coding style issues in the file") from the usb tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/gadget/rndis.c
index 33a9475,6a7dd91..0000000
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@@ -914,12 -912,14 +912,12 @@@ int rndis_register(void (*resp_avail)(v
  	return -ENODEV;
  }
  
- void rndis_deregister (int configNr)
+ void rndis_deregister(int configNr)
  {
- 	pr_debug("%s: \n", __func__);
+ 	pr_debug("%s:\n", __func__);
  
  	if (configNr >= RNDIS_MAX_CONFIGS) return;
- 	rndis_per_dev_params [configNr].used = 0;
+ 	rndis_per_dev_params[configNr].used = 0;
 -
 -	return;
  }
  
  int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)

Re: linux-next: manual merge of the usb tree with the trivial tree

[Greg KH]

On Tue, Sep 14, 2010 at 12:28:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/rndis.c between commit
> 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> unnecessary return's from void functions") from the trivial tree and
> commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget: rndis: fix
> up coding style issues in the file") from the usb tree.
> 
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Fix looks good to me, thanks for carrying this.

greg k-h

linux-next: manual merge of the usb tree with the trivial tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/musb_gadget.c between commit
7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
unnecessary return's from void functions") from the trivial tree and
commit 82cccbf2458e50dabf8b9946b3f0ef0e8d31711f ("usb: musb: gadget: kill
unreachable code in musb_g_rx()") from the usb tree.

The latter also fixes the problem fixed in the former, so I just used the
latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the usb tree with the trivial tree

[Greg KH]

On Wed, Oct 06, 2010 at 02:14:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/musb_gadget.c between commit
> 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> unnecessary return's from void functions") from the trivial tree and
> commit 82cccbf2458e50dabf8b9946b3f0ef0e8d31711f ("usb: musb: gadget: kill
> unreachable code in musb_g_rx()") from the usb tree.
> 
> The latter also fixes the problem fixed in the former, so I just used the
> latter.

That sounds great, thanks for doing this.

greg k-h

Re: linux-next: manual merge of the usb tree with the trivial tree

[Felipe Balbi]

On Tue, Oct 05, 2010 at 10:14:14PM -0500, Stephen Rothwell wrote:
>Hi Greg,
>
>Today's linux-next merge of the usb tree got a conflict in
>drivers/usb/musb/musb_gadget.c between commit
>7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
>unnecessary return's from void functions") from the trivial tree and

funny that I wasn't CCed to that one :-(

-- 
balbi

Re: linux-next: manual merge of the usb tree with the trivial tree

[Greg KH]

On Wed, Oct 06, 2010 at 09:19:27AM +0300, Felipe Balbi wrote:
> On Tue, Oct 05, 2010 at 10:14:14PM -0500, Stephen Rothwell wrote:
> >Hi Greg,
> >
> >Today's linux-next merge of the usb tree got a conflict in
> >drivers/usb/musb/musb_gadget.c between commit
> >7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> >unnecessary return's from void functions") from the trivial tree and
> 
> funny that I wasn't CCed to that one :-(

It was 'trivial' patches, which don't always get sent to the individual
developer unfortunately.

sorry,

greg k-h

Re: linux-next: manual merge of the usb tree with the trivial tree

[Felipe Balbi]

On Wed, Oct 06, 2010 at 09:05:56AM -0500, Greg KH wrote:
>On Wed, Oct 06, 2010 at 09:19:27AM +0300, Felipe Balbi wrote:
>> On Tue, Oct 05, 2010 at 10:14:14PM -0500, Stephen Rothwell wrote:
>> >Hi Greg,
>> >
>> >Today's linux-next merge of the usb tree got a conflict in
>> >drivers/usb/musb/musb_gadget.c between commit
>> >7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
>> >unnecessary return's from void functions") from the trivial tree and
>>
>> funny that I wasn't CCed to that one :-(
>
>It was 'trivial' patches, which don't always get sent to the individual
>developer unfortunately.
>
>sorry,

ok, no problem. It would just help avoiding the conflict :-D

-- 
balbi

Re: linux-next: manual merge of the usb tree with the trivial tree

[Jiri Kosina]

On Wed, 6 Oct 2010, Stephen Rothwell wrote:

> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/musb_gadget.c between commit
> 7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
> unnecessary return's from void functions") from the trivial tree and
> commit 82cccbf2458e50dabf8b9946b3f0ef0e8d31711f ("usb: musb: gadget: kill
> unreachable code in musb_g_rx()") from the usb tree.
> 
> The latter also fixes the problem fixed in the former, so I just used the
> latter.

I have reverted the hunk in question in my tree, so the conflict should be 
gone now.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.