LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: David Brownell <david-b@pacbell.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Greg KH <greg@kroah.com>,
	akpm@osdl.org, linux-usb-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org
Subject: Re: [linux-usb-devel] [BK PATCH] USB changes for 2.6.6
Date: Sun, 16 May 2004 10:51:07 -0700	[thread overview]
Message-ID: <40A7AA0B.5000200@pacbell.net> (raw)
In-Reply-To: <Pine.LNX.4.58.0405151034500.10718@ppc970.osdl.org>

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

Linus Torvalds wrote:

> ... would never have
> compiled with debugging on anyway. 

Speaking of which, please consider merging this.  It
missed Greg's push on Friday, but it's needed to build
OHCI and EHCI with CONFIG_USB_DEBUG when !CONFIG_PM.

By request, this adds (and uses) a new API call to hide
the necessary #ifdef once, rather than repeat it in every
driver.  It's an accessor for a field only exists when
#ifdef CONFIG_PM.  These particular references prevent
dumping registers when that part of the chip suspended.

- Dave



[-- Attachment #2: Diff --]
[-- Type: text/plain, Size: 1200 bytes --]

--- 1.13/include/linux/pm.h	Thu Aug 21 11:47:27 2003
+++ edited/include/linux/pm.h	Sun May 16 10:49:54 2004
@@ -238,6 +238,16 @@
 #endif
 };
 
+static inline u32
+device_pm_state(struct dev_pm_info *info)
+{
+#ifdef	CONFIG_PM
+	return info->power_state;
+#else
+	return 0;
+#endif
+}
+
 extern void device_pm_set_parent(struct device * dev, struct device * parent);
 
 extern int device_suspend(u32 state);
--- 1.33/drivers/usb/host/ehci-dbg.c	Fri May  7 12:48:33 2004
+++ edited/drivers/usb/host/ehci-dbg.c	Sun May 16 10:49:54 2004
@@ -639,7 +639,7 @@
 
 	spin_lock_irqsave (&ehci->lock, flags);
 
-	if (bus->controller->power.power_state) {
+	if (device_pm_state (&bus->controller->power)) {
 		size = scnprintf (next, size,
 			"bus %s, device %s (driver " DRIVER_VERSION ")\n"
 			"SUSPENDED (no register access)\n",
--- 1.26/drivers/usb/host/ohci-dbg.c	Tue May 11 13:17:33 2004
+++ edited/drivers/usb/host/ohci-dbg.c	Sun May 16 10:49:54 2004
@@ -623,7 +623,7 @@
 		hcd->self.controller->bus_id,
 		hcd_name);
 
-	if (bus->controller->power.power_state) {
+	if (device_pm_state (&bus->controller->power)) {
 		size -= scnprintf (next, size,
 			"SUSPENDED (no register access)\n");
 		goto done;

  reply	other threads:[~2004-05-16 17:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-05-14 22:45 Greg KH
2004-05-15 11:32 ` [linux-usb-devel] " Olaf Hering
2004-05-15 17:37   ` Linus Torvalds
2004-05-16 17:51     ` David Brownell [this message]
2004-05-16 18:02       ` Linus Torvalds
2004-05-16 18:14         ` David Brownell
2004-05-16 18:22           ` Linus Torvalds
2004-05-16 18:28             ` David Brownell
2004-05-16 18:31       ` Greg KH
2004-05-19 20:33     ` Erik Rigtorp
2004-05-19 20:49       ` Greg KH

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=40A7AA0B.5000200@pacbell.net \
    --to=david-b@pacbell.net \
    --cc=akpm@osdl.org \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb-devel@lists.sourceforge.net \
    --cc=torvalds@osdl.org \
    --subject='Re: [linux-usb-devel] [BK PATCH] USB changes for 2.6.6' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).