From: Pavel Machek <pavel@ucw.cz>
To: Andrew Morton <akpm@zip.com.au>,
kernel list <linux-kernel@vger.kernel.org>,
Greg KH <greg@kroah.com>,
Nigel Cunningham <ncunningham@linuxmail.org>
Subject: Remaining u32 vs. pm_message_t fixes
Date: Fri, 25 Mar 2005 11:24:52 +0100 [thread overview]
Message-ID: <20050325102452.GA1352@elf.ucw.cz> (raw)
Hi!
This fixes three remaining places where we put u32 (or worse
suspend_state_t) into pm_message_t-sized box. As a bonus, PCI_D0 is
used instead of constant 0. Please apply,
Signed-off-by: Pavel Machek <pavel@suse.cz>
Pavel
PS: Nigel, if you know about some other places in -rc1-mm3 where u32
is confused with pm_message_t, please let me know....
--- clean-mm/drivers/usb/host/sl811-hcd.c 2005-03-25 10:09:01.000000000 +0100
+++ linux-delme/drivers/usb/host/sl811-hcd.c 2005-03-25 11:20:53.000000000 +0100
@@ -1809,7 +1809,7 @@
return 0;
}
- dev->power.power_state = PM_SUSPEND_ON;
+ dev->power.power_state = PMSG_ON;
return sl811h_hub_resume(hcd);
}
--- clean-mm/drivers/video/i810/i810_main.c 2005-03-25 10:09:01.000000000 +0100
+++ linux-delme/drivers/video/i810/i810_main.c 2005-03-25 11:21:09.000000000 +0100
@@ -1492,7 +1492,7 @@
/***********************************************************************
* Power Management *
***********************************************************************/
-static int i810fb_suspend(struct pci_dev *dev, u32 state)
+static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)
{
struct fb_info *info = pci_get_drvdata(dev);
struct i810fb_par *par = (struct i810fb_par *) info->par;
@@ -1538,7 +1538,7 @@
return 0;
pci_restore_state(dev);
- pci_set_power_state(dev, 0);
+ pci_set_power_state(dev, PCI_D0);
pci_enable_device(dev);
agp_bind_memory(par->i810_gtt.i810_fb_memory,
par->fb.offset);
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
next reply other threads:[~2005-03-25 10:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-25 10:24 Pavel Machek [this message]
2005-03-25 20:29 ` Remaining u32 vs. pm_message_t fixes Russell King
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=20050325102452.GA1352@elf.ucw.cz \
--to=pavel@ucw.cz \
--cc=akpm@zip.com.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ncunningham@linuxmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox