lkml.org 
[lkml]   [2013]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH V2] usb: storage: Convert US_DEBUGP to usb_stor_dbg
On Mon, 22 Apr 2013 12:35:26 -0700 (PDT) David Rientjes <rientjes@google.com> wrote:

> On Fri, 19 Apr 2013, Joe Perches wrote:
>
> > @@ -966,11 +934,13 @@ static int realtek_cr_autosuspend_setup(struct us_data *us)
> > static void realtek_cr_destructor(void *extra)
> > {
> > struct rts51x_chip *chip = (struct rts51x_chip *)extra;
> > -
> > - US_DEBUGP("%s: <---\n", __func__);
> > + struct us_data *us;
> >
> > if (!chip)
> > return;
> > +
> > + us = chip->us;
> > +
> > #ifdef CONFIG_REALTEK_AUTOPM
> > if (ss_en) {
> > del_timer(&chip->rts51x_suspend_timer);
>
> >From linux-next:
>
> drivers/usb/storage/realtek_cr.c: In function 'realtek_cr_destructor':
> drivers/usb/storage/realtek_cr.c:942:11: error: 'struct rts51x_chip' has no member named 'us'
>
> chip->us here is only defined when CONFIG_REALTEK_AUTOPM is enabled.

local var `us' doesn't get used by anything and it's unclear why that
patch added it?



From: Andrew Morton <akpm@linux-foundation.org>
Subject: drivers/usb/storage/realtek_cr.c: fix build

Remove unused local `us', which broke the build. Also nuke an unneeded
cast.

Repairs 191648d03d20 ("usb: storage: Convert US_DEBUGP to usb_stor_dbg").

Cc: Joe Perches <joe@perches.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

drivers/usb/storage/realtek_cr.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff -puN drivers/usb/storage/realtek_cr.c~drivers-usb-storage-realtek_crc-fix-build drivers/usb/storage/realtek_cr.c
--- a/drivers/usb/storage/realtek_cr.c~drivers-usb-storage-realtek_crc-fix-build
+++ a/drivers/usb/storage/realtek_cr.c
@@ -933,14 +933,11 @@ static int realtek_cr_autosuspend_setup(

static void realtek_cr_destructor(void *extra)
{
- struct rts51x_chip *chip = (struct rts51x_chip *)extra;
- struct us_data *us;
+ struct rts51x_chip *chip = extra;

if (!chip)
return;

- us = chip->us;
-
#ifdef CONFIG_REALTEK_AUTOPM
if (ss_en) {
del_timer(&chip->rts51x_suspend_timer);
_

Left unfixed:

drivers/usb/storage/realtek_cr.c:628: warning: 'config_autodelink_before_power_down' defined but not used
drivers/usb/storage/realtek_cr.c:698: warning: 'fw5895_init' defined but not used



\
 
 \ /
  Last update: 2013-04-26 01:01    [W:0.045 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site