All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Greg KH <gregkh@suse.de>, Oliver Neukum <oliver@neukum.org>,
	Elina Pasheva <epasheva@sierrawireless.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Subject: [origin tree build failure] [PATCH] USB sierra: Fix build if !CONFIG_PM
Date: Wed, 23 Sep 2009 19:24:56 +0200	[thread overview]
Message-ID: <20090923172456.GA8948@elte.hu> (raw)
In-Reply-To: <20090923135539.GA6542@kroah.com>


>       USB: support for autosuspend in sierra while online

FYI, -tip testing found a build failure with the sierra driver on 
!CONFIG_PM - fixed via the patch below.

Thanks,

	Ingo

-------------------->
>From 26f8ed899041199caa9315e057a28d10f81b5b88 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 23 Sep 2009 19:19:47 +0200
Subject: [PATCH] USB sierra: Fix build if !CONFIG_PM

This build failure:

  drivers/usb/serial/sierra.c: In function 'sierra_suspend':
  drivers/usb/serial/sierra.c:936: error: 'struct usb_device' has no member named 'auto_pm'

Triggers because the ->auto_pm functionality depends on CONFIG_PM.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 drivers/usb/serial/sierra.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 68fa0e4..b089a70 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -912,6 +912,8 @@ static void sierra_release(struct usb_serial *serial)
 	}
 }
 
+#ifdef CONFIG_PM
+
 static void stop_read_write_urbs(struct usb_serial *serial)
 {
 	int i, j;
@@ -989,6 +991,8 @@ static int sierra_resume(struct usb_serial *serial)
 	return ec ? -EIO : 0;
 }
 
+#endif /* CONFIG_PM */
+
 static struct usb_serial_driver sierra_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
@@ -1009,8 +1013,10 @@ static struct usb_serial_driver sierra_device = {
 	.tiocmset          = sierra_tiocmset,
 	.attach            = sierra_startup,
 	.release           = sierra_release,
+#ifdef CONFIG_PM
 	.suspend	   = sierra_suspend,
 	.resume		   = sierra_resume,
+#endif
 	.read_int_callback = sierra_instat_callback,
 };
 

  reply	other threads:[~2009-09-23 17:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-23 13:55 [GIT PATCH] USB patches for 2.6.31-git Greg KH
2009-09-23 17:24 ` Ingo Molnar [this message]
2009-09-23 17:32   ` [origin tree build failure] [PATCH] USB sierra: Fix build if !CONFIG_PM Randy Dunlap
2009-09-23 17:39     ` Ingo Molnar
2009-09-23 17:34   ` Greg KH
2009-09-23 17:37 ` [origin tree boot hang] [PATCH] Revert "early_printk: Allow more than one early console" Ingo Molnar
2009-09-23 17:57   ` [origin tree boot hang] [PATCH] Revert "early_printk: Allow morethan " Jason Wessel
2009-09-23 19:02     ` Ingo Molnar
2009-09-23 19:17       ` Ingo Molnar
2009-09-23 21:05         ` Ingo Molnar
2009-09-23 21:19           ` [origin tree boot hang] [PATCH] Revert "early_printk: Allowmorethan " Jason Wessel
2009-09-23 21:39             ` Ingo Molnar
2009-09-23 22:39               ` [origin tree boot hang] [PATCH] Revert "early_printk:Allowmorethan " Jason Wessel
2009-09-23 22:56                 ` Linus Torvalds
2009-09-23 23:13                   ` Jason Wessel
2009-09-24 11:48                     ` [tip:x86/urgent] x86: early_printk: Protect against using the same device twice tip-bot for Jason Wessel
2009-09-24 12:22             ` [origin tree boot hang] [PATCH] Revert "early_printk: Allowmorethan one early console" Johannes Weiner
2009-09-24 14:08               ` Jason Wessel
2009-10-01  8:34                 ` Ingo Molnar
2009-10-01  9:58                 ` [tip:x86/urgent] x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg tip-bot for Jason Wessel

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=20090923172456.GA8948@elte.hu \
    --to=mingo@elte.hu \
    --cc=akpm@linux-foundation.org \
    --cc=epasheva@sierrawireless.com \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=oliver@neukum.org \
    --cc=torvalds@linux-foundation.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.