From: Pavel Machek <pavel@suse.cz>
To: Andrew Morton <akpm@osdl.org>,
adaplas@pol.net, linux-fbdev-devel@lists.sourceforge.net
Cc: ncunningham@cyclades.com, bernard@blackham.com.au,
torvalds@osdl.org, linux-kernel@vger.kernel.org
Subject: Fix u32 vs. pm_message_t confusion in framebuffers
Date: Tue, 15 Feb 2005 01:54:33 +0100 [thread overview]
Message-ID: <20050215005433.GG5415@elf.ucw.cz> (raw)
In-Reply-To: <20050214134658.324076c9.akpm@osdl.org>
Hi!
This should fix u32 vs pm_message_t confusion in framebuffers, and do
no code changes. Please apply,
Signed-off-by: Pavel Machek <pavel@suse.cz>
Pavel
--- clean-mm/drivers/video/aty/aty128fb.c 2005-02-15 00:46:41.000000000 +0100
+++ linux-mm/drivers/video/aty/aty128fb.c 2005-02-15 01:04:11.000000000 +0100
@@ -166,7 +166,7 @@
static int aty128_probe(struct pci_dev *pdev,
const struct pci_device_id *ent);
static void aty128_remove(struct pci_dev *pdev);
-static int aty128_pci_suspend(struct pci_dev *pdev, u32 state);
+static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state);
static int aty128_pci_resume(struct pci_dev *pdev);
static int aty128_do_resume(struct pci_dev *pdev);
@@ -2330,7 +2330,7 @@
}
}
-static int aty128_pci_suspend(struct pci_dev *pdev, u32 state)
+static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct fb_info *info = pci_get_drvdata(pdev);
struct aty128fb_par *par = info->par;
@@ -2413,7 +2413,7 @@
par->lock_blank = 0;
aty128fb_blank(0, info);
- pdev->dev.power.power_state = 0;
+ pdev->dev.power.power_state = PMSG_ON;
printk(KERN_DEBUG "aty128fb: resumed !\n");
--- clean-mm/drivers/video/aty/atyfb_base.c 2005-02-15 00:34:40.000000000 +0100
+++ linux-mm/drivers/video/aty/atyfb_base.c 2005-02-15 01:04:11.000000000 +0100
@@ -2016,7 +2016,7 @@
return timeout ? 0 : -EIO;
}
-static int atyfb_pci_suspend(struct pci_dev *pdev, u32 state)
+static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct fb_info *info = pci_get_drvdata(pdev);
struct atyfb_par *par = (struct atyfb_par *) info->par;
@@ -2091,7 +2091,7 @@
release_console_sem();
- pdev->dev.power.power_state = 0;
+ pdev->dev.power.power_state = PMSG_ON;
return 0;
}
--- clean-mm/drivers/video/aty/radeon_pm.c 2005-02-15 00:46:41.000000000 +0100
+++ linux-mm/drivers/video/aty/radeon_pm.c 2005-02-15 01:04:11.000000000 +0100
@@ -2663,7 +2663,7 @@
else if (rinfo->dynclk == 0)
radeon_pm_disable_dynamic_mode(rinfo);
- pdev->dev.power.power_state = 0;
+ pdev->dev.power.power_state = PMSG_ON;
bail:
release_console_sem();
--- clean-mm/drivers/video/aty/radeonfb.h 2005-02-15 00:46:41.000000000 +0100
+++ linux-mm/drivers/video/aty/radeonfb.h 2005-02-15 01:04:11.000000000 +0100
@@ -624,7 +624,7 @@
extern int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, u8 **out_edid);
/* PM Functions */
-extern int radeonfb_pci_suspend(struct pci_dev *pdev, u32 state);
+extern int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state);
extern int radeonfb_pci_resume(struct pci_dev *pdev);
extern void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk);
extern void radeonfb_pm_exit(struct radeonfb_info *rinfo);
--- clean-mm/drivers/video/cyber2000fb.c 2005-02-15 00:34:40.000000000 +0100
+++ linux-mm/drivers/video/cyber2000fb.c 2005-02-15 01:04:11.000000000 +0100
@@ -1665,7 +1665,7 @@
}
}
-static int cyberpro_pci_suspend(struct pci_dev *dev, u32 state)
+static int cyberpro_pci_suspend(struct pci_dev *dev, pm_message_t state)
{
return 0;
}
--- clean-mm/drivers/video/i810/i810_main.c 2005-02-15 00:46:41.000000000 +0100
+++ linux-mm/drivers/video/i810/i810_main.c 2005-02-15 01:04:11.000000000 +0100
@@ -1524,7 +1524,7 @@
pci_disable_device(dev);
}
pci_save_state(dev);
- pci_set_power_state(dev, state);
+ pci_set_power_state(dev, pci_choose_state(dev, state));
return 0;
}
--- clean-mm/drivers/video/i810/i810_main.h 2004-04-05 10:45:24.000000000 +0200
+++ linux-mm/drivers/video/i810/i810_main.h 2005-02-15 01:04:11.000000000 +0100
@@ -18,7 +18,7 @@
const struct pci_device_id *entry);
static void __exit i810fb_remove_pci(struct pci_dev *dev);
static int i810fb_resume(struct pci_dev *dev);
-static int i810fb_suspend(struct pci_dev *dev, u32 state);
+static int i810fb_suspend(struct pci_dev *dev, pm_message_t state);
/*
* voffset - framebuffer offset in MiB from aperture start address. In order for
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
next prev parent reply other threads:[~2005-02-15 0:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-14 5:43 PATCH: Address lots of pending pm_message_t changes Nigel Cunningham
2005-02-14 21:34 ` Pavel Machek
2005-02-14 21:46 ` Andrew Morton
2005-02-14 21:57 ` Nigel Cunningham
2005-02-14 22:04 ` Pavel Machek
2005-02-14 22:09 ` Nigel Cunningham
2005-02-14 23:41 ` Pavel Machek
2005-02-15 0:15 ` Nigel Cunningham
2005-02-15 0:15 ` Pavel Machek
2005-02-15 0:21 ` Nigel Cunningham
2005-02-15 1:13 ` Bernard Blackham
2005-02-15 0:31 ` Fix pm_message_t in generic code [was Re: PATCH: Address lots of pending pm_message_t changes] Pavel Machek
2005-02-15 0:46 ` Nigel Cunningham
2005-02-15 0:39 ` Fix u32 vs. pm_message_t in USB " Pavel Machek
2005-02-17 23:40 ` Greg KH
2005-02-28 1:24 ` Pavel Machek
2005-02-15 0:41 ` Fix u32 vs. pm_message_t confusion in OSS Pavel Machek
2005-02-15 0:46 ` Fix u32 vs. pm_message_t confusion in PCMCIA Pavel Machek
2005-02-15 0:47 ` FIx u32 vs. pm_message_t confusion in firewire Pavel Machek
2005-02-15 22:12 ` Jody McIntyre
2005-02-15 0:51 ` Fix u32 vs. pm_message_t in network device drivers Pavel Machek
2005-02-15 0:54 ` Pavel Machek [this message]
2005-02-15 0:55 ` Fix u32 vs. pm_message_t in i8042.c Pavel Machek
2005-02-15 13:10 ` Vojtech Pavlik
2005-02-15 0:57 ` Fix u32 vs. pm_message_t confusion in MMC Pavel Machek
2005-02-15 0:58 ` Fix u32 vs. pm_message_t confusion in serials Pavel Machek
2005-02-15 1:00 ` Fix u32 vs. pm_message_t in macintosh Pavel Machek
2005-02-15 1:00 ` Fix u32 vs. pm_message_t confusion in bttv Pavel Machek
2005-02-15 1:01 ` Fix u32 vs. pm_message_t confusion in AGP Pavel Machek
2005-02-14 21:46 ` PATCH: Address lots of pending pm_message_t changes Pavel Machek
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=20050215005433.GG5415@elf.ucw.cz \
--to=pavel@suse.cz \
--cc=adaplas@pol.net \
--cc=akpm@osdl.org \
--cc=bernard@blackham.com.au \
--cc=linux-fbdev-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ncunningham@cyclades.com \
--cc=torvalds@osdl.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
all inboxes | Powered by JetHome®