summaryrefslogtreecommitdiffstats
path: root/drivers/video/aty
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2013-09-11 14:35:05 -0700
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-09-19 13:30:05 +0300
commit8d0c03dd2d1e8fd0f7ac3d43e90ed99dd748ed7a (patch)
treef0515ace1f8b5833db17022c1675fdb098d383a6 /drivers/video/aty
parent5a7bbe86b0b99b1075b97d812946a84ed5fda9ff (diff)
downloadlinux-stable-8d0c03dd2d1e8fd0f7ac3d43e90ed99dd748ed7a.tar.gz
linux-stable-8d0c03dd2d1e8fd0f7ac3d43e90ed99dd748ed7a.tar.bz2
linux-stable-8d0c03dd2d1e8fd0f7ac3d43e90ed99dd748ed7a.zip
aty128fb: Use pci_dev pm_cap
Use the already existing pm_cap variable in struct pci_dev for determining the power management offset. This saves the driver from having to keep track of an extra variable. Signed-off-by: Jon Mason <jdmason@kudzu.us> Cc: Paul Mackerras <paulus@samba.org> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/aty')
-rw-r--r--drivers/video/aty/aty128fb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index a4dfe8cb0a0a..b5edb6f08b84 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -413,7 +413,6 @@ struct aty128fb_par {
int blitter_may_be_busy;
int fifo_slots; /* free slots in FIFO (64 max) */
- int pm_reg;
int crt_on, lcd_on;
struct pci_dev *pdev;
struct fb_info *next;
@@ -2016,7 +2015,6 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
aty128_init_engine(par);
- par->pm_reg = pdev->pm_cap;
par->pdev = pdev;
par->asleep = 0;
par->lock_blank = 0;
@@ -2397,7 +2395,7 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
u32 pmgt;
struct pci_dev *pdev = par->pdev;
- if (!par->pm_reg)
+ if (!par->pdev->pm_cap)
return;
/* Set the chip into the appropriate suspend mode (we use D2,