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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1009021633020.26813@pobox.suse.cz>
Date:	Thu, 2 Sep 2010 16:34:36 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Greg KH <greg@...ah.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	JiebingLi <jiebing.li@...el.com>, Joe Perches <joe@...ches.com>
Subject: Re: linux-next: manual merge of the usb tree with the trivial tree

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@...ches.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@...ches.com>
Signed-off-by: Jiri Kosina <jkosina@...e.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/