From 8e04d6d83a8ddbd6d81f497e583b8d15de3c2995 Mon Sep 17 00:00:00 2001 From: Rakib Mullick Date: Fri, 23 Dec 2011 00:46:45 +0600 Subject: [PATCH] staging: gma500: Fix warning in power.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gma_resume_display() wants 'struct pci_dev *' as it's parameter, so lets pass dev->pdev instead of dev. Fixes the following warning. drivers/staging/gma500/power.c: In function ‘gma_power_begin’: drivers/staging/gma500/power.c:269:3: warning: passing argument 1 of ‘gma_resume_display’ from incompatible pointer type drivers/staging/gma500/power.c:99:13: note: expected ‘struct pci_dev *’ but argument is of type ‘struct drm_device *’ Signed-off-by: Rakib Mullick Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gma500/power.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c index 436fe9733b1..40825703833 100644 --- a/drivers/staging/gma500/power.c +++ b/drivers/staging/gma500/power.c @@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on) ret = gma_resume_pci(dev->pdev); if (ret == 0) { /* FIXME: we want to defer this for Medfield/Oaktrail */ - gma_resume_display(dev); + gma_resume_display(dev->pdev); psb_irq_preinstall(dev); psb_irq_postinstall(dev); pm_runtime_get(&dev->pdev->dev);