From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] More Driver Core patches for 2.6.10-rc1
Date: Fri, 12 Nov 2004 15:00:07 -0800 [thread overview]
Message-ID: <1100300407123@kroah.com> (raw)
In-Reply-To: <1100300407889@kroah.com>
ChangeSet 1.2100, 2004/11/12 11:44:09-08:00, greg@kroah.com
[PATCH] driver core: fix up some missed power_state changes from David's patch
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/video/aty/aty128fb.c | 10 +++++-----
drivers/video/aty/atyfb_base.c | 10 +++++-----
drivers/video/aty/radeon_pm.c | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff -Nru a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
--- a/drivers/video/aty/aty128fb.c 2004-11-12 14:52:49 -08:00
+++ b/drivers/video/aty/aty128fb.c 2004-11-12 14:52:49 -08:00
@@ -2363,7 +2363,7 @@
state = 2;
#endif /* CONFIG_PPC_PMAC */
- if (state != 2 || state == pdev->dev.power_state)
+ if (state != 2 || state == pdev->dev.power.power_state)
return 0;
printk(KERN_DEBUG "aty128fb: suspending...\n");
@@ -2394,7 +2394,7 @@
release_console_sem();
- pdev->dev.power_state = state;
+ pdev->dev.power.power_state = state;
return 0;
}
@@ -2404,13 +2404,13 @@
struct fb_info *info = pci_get_drvdata(pdev);
struct aty128fb_par *par = info->par;
- if (pdev->dev.power_state == 0)
+ if (pdev->dev.power.power_state == 0)
return 0;
acquire_console_sem();
/* Wakeup chip */
- if (pdev->dev.power_state == 2)
+ if (pdev->dev.power.power_state == 2)
aty128_set_suspend(par, 0);
par->asleep = 0;
@@ -2430,7 +2430,7 @@
release_console_sem();
- pdev->dev.power_state = 0;
+ pdev->dev.power.power_state = 0;
printk(KERN_DEBUG "aty128fb: resumed !\n");
diff -Nru a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
--- a/drivers/video/aty/atyfb_base.c 2004-11-12 14:52:49 -08:00
+++ b/drivers/video/aty/atyfb_base.c 2004-11-12 14:52:49 -08:00
@@ -2033,7 +2033,7 @@
state = 2;
#endif /* CONFIG_PPC_PMAC */
- if (state != 2 || state == pdev->dev.power_state)
+ if (state != 2 || state == pdev->dev.power.power_state)
return 0;
acquire_console_sem();
@@ -2062,7 +2062,7 @@
release_console_sem();
- pdev->dev.power_state = state;
+ pdev->dev.power.power_state = state;
return 0;
}
@@ -2072,12 +2072,12 @@
struct fb_info *info = pci_get_drvdata(pdev);
struct atyfb_par *par = (struct atyfb_par *) info->par;
- if (pdev->dev.power_state == 0)
+ if (pdev->dev.power.power_state == 0)
return 0;
acquire_console_sem();
- if (pdev->dev.power_state == 2)
+ if (pdev->dev.power.power_state == 2)
aty_power_mgmt(0, par);
par->asleep = 0;
@@ -2093,7 +2093,7 @@
release_console_sem();
- pdev->dev.power_state = 0;
+ pdev->dev.power.power_state = 0;
return 0;
}
diff -Nru a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
--- a/drivers/video/aty/radeon_pm.c 2004-11-12 14:52:49 -08:00
+++ b/drivers/video/aty/radeon_pm.c 2004-11-12 14:52:49 -08:00
@@ -898,7 +898,7 @@
release_console_sem();
- pdev->dev.power_state = state;
+ pdev->dev.power.power_state = state;
return 0;
}
@@ -908,7 +908,7 @@
struct fb_info *info = pci_get_drvdata(pdev);
struct radeonfb_info *rinfo = info->par;
- if (pdev->dev.power_state == 0)
+ if (pdev->dev.power.power_state == 0)
return 0;
acquire_console_sem();
@@ -935,7 +935,7 @@
release_console_sem();
- pdev->dev.power_state = 0;
+ pdev->dev.power.power_state = 0;
printk(KERN_DEBUG "radeonfb: resumed !\n");
next prev parent reply other threads:[~2004-11-12 23:02 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-12 22:58 [BK PATCH] More Driver Core patches for 2.6.10-rc1 Greg KH
2004-11-12 23:00 ` [PATCH] " Greg KH
2004-11-12 23:00 ` Greg KH
2004-11-12 23:00 ` Greg KH
2004-11-12 23:00 ` Greg KH
2004-11-12 23:00 ` Greg KH
2004-11-12 23:00 ` Greg KH
2004-11-12 23:00 ` Greg KH
2004-11-12 23:00 ` Greg KH [this message]
2004-11-12 23:00 ` Greg KH
[not found] ` <20041113000052.GC346@electric-eye.fr.zoreil.com>
[not found] ` <200411130020.17494.lists@kenneth.aafloy.net>
2004-11-13 0:44 ` Greg KH
2004-11-13 20:51 ` [BK PATCH] " Linus Torvalds
2004-11-13 21:10 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2004-11-05 0:35 [BK PATCH] More USB " Greg KH
2004-11-05 0:48 ` [PATCH] More Driver Core " Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` Greg KH
2004-11-05 0:48 ` 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=1100300407123@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.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.