[PATCH] usb_wwan: fix build error in play_delayed.

[PATCH] usb_wwan: fix build error in play_delayed.

[Tao Ma]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]

From: Tao Ma <boyu.mt@taobao.com>

There is a build error in today's linus tree.
drivers/usb/serial/usb_wwan.c: In function ‘play_delayed’:
drivers/usb/serial/usb_wwan.c:702: error: ‘struct dev_pm_info’ has no member named ‘usage_count’
The reason is that usage_count is wrapped with macro CONFIG_PM_RUNTIME
now in dev_pm_info.

So use the corresponding pm_runtime_get_noresume instead.

Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
 drivers/usb/serial/usb_wwan.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index a65ddd5..5858ce4 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -699,7 +699,7 @@ static void play_delayed(struct usb_serial_port *port)
 			do {
 				unbusy_queued_urb(urb, portdata);
 				//extremely dirty
-				atomic_dec(&port->serial->interface->dev.power.usage_count);
+				pm_runtime_get_noresume(&port->serial->interface->dev);
 			} while ((urb = usb_get_from_anchor(&portdata->delayed)));
 			break;
 		}
-- 
1.6.3.GIT

Re: [PATCH] usb_wwan: fix build error in play_delayed.

[Eric Dumazet]

Le mardi 22 mars 2011 à 12:29 +0800, Tao Ma a écrit :
> From: Tao Ma <boyu.mt@taobao.com>
> 
> There is a build error in today's linus tree.
> drivers/usb/serial/usb_wwan.c: In function ‘play_delayed’:
> drivers/usb/serial/usb_wwan.c:702: error: ‘struct dev_pm_info’ has no member named ‘usage_count’
> The reason is that usage_count is wrapped with macro CONFIG_PM_RUNTIME
> now in dev_pm_info.
> 
> So use the corresponding pm_runtime_get_noresume instead.
> 
> Cc: Greg Kroah-Hartman <gregkh@suse.de>
> Signed-off-by: Tao Ma <boyu.mt@taobao.com>
> ---
>  drivers/usb/serial/usb_wwan.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
> index a65ddd5..5858ce4 100644
> --- a/drivers/usb/serial/usb_wwan.c
> +++ b/drivers/usb/serial/usb_wwan.c
> @@ -699,7 +699,7 @@ static void play_delayed(struct usb_serial_port *port)
>  			do {
>  				unbusy_queued_urb(urb, portdata);
>  				//extremely dirty
> -				atomic_dec(&port->serial->interface->dev.power.usage_count);
> +				pm_runtime_get_noresume(&port->serial->interface->dev);
>  			} while ((urb = usb_get_from_anchor(&portdata->delayed)));
>  			break;
>  		}

Oh well, thats the third time this patch is sent

Re: [PATCH] usb_wwan: fix build error in play_delayed.

[Greg KH]

On Tue, Mar 22, 2011 at 07:05:55AM +0100, Eric Dumazet wrote:
> Le mardi 22 mars 2011 à 12:29 +0800, Tao Ma a écrit :
> > From: Tao Ma <boyu.mt@taobao.com>
> > 
> > There is a build error in today's linus tree.
> > drivers/usb/serial/usb_wwan.c: In function ‘play_delayed’:
> > drivers/usb/serial/usb_wwan.c:702: error: ‘struct dev_pm_info’ has no member named ‘usage_count’
> > The reason is that usage_count is wrapped with macro CONFIG_PM_RUNTIME
> > now in dev_pm_info.
> > 
> > So use the corresponding pm_runtime_get_noresume instead.
> > 
> > Cc: Greg Kroah-Hartman <gregkh@suse.de>
> > Signed-off-by: Tao Ma <boyu.mt@taobao.com>
> > ---
> >  drivers/usb/serial/usb_wwan.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
> > index a65ddd5..5858ce4 100644
> > --- a/drivers/usb/serial/usb_wwan.c
> > +++ b/drivers/usb/serial/usb_wwan.c
> > @@ -699,7 +699,7 @@ static void play_delayed(struct usb_serial_port *port)
> >  			do {
> >  				unbusy_queued_urb(urb, portdata);
> >  				//extremely dirty
> > -				atomic_dec(&port->serial->interface->dev.power.usage_count);
> > +				pm_runtime_get_noresume(&port->serial->interface->dev);
> >  			} while ((urb = usb_get_from_anchor(&portdata->delayed)));
> >  			break;
> >  		}
> 
> Oh well, thats the third time this patch is sent

Yes, sorry, been busy with other stuff, this will get fixed soon, I have
enough copies of it in my queue :)

thanks,

greg k-h