staging, gma500: Fix warning in power.c
PATCH 1/1 staging, gma500: Fix warning in power.c
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 *’
---
drivers/staging/gma500/power.c +1 -1
@@ -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);
Quoted 8 lines · On Fri, 23 Dec 2011 00:46:45 +0600 Rakib Mullick <[email protected]>…
gma_resume_display()wants 'structpci_dev*' as it's parameter, so
lets passdev->pdevinstead 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 typedrivers/staging/gma500/power.c:99:13: note: expected ‘structpci_dev*’ but argument is of type ‘structdrm_device*’
This staging driver is now dead and replaced with drivers/gpu/drm/gma500/. Thanks for the fix however
Alan
Quoted 6 lines · Alan Cox
Quoted 3 lines · On Fri, 23 Dec 2011 00:46:45 +0600 Rakib Mullick <[email protected]>…
gma_resume_display() wants 'struct
pci_dev*' as it's parameter, so lets passdev->pdevinstead of dev. Fixes the following warning.
Quoted 9 lines
Quoted 5 lines
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 typedrivers/staging/gma500/power.c:99:13: note: expected ‘structpci_dev*’ but argument is of type ‘structdrm_device*’This staging driver is now dead and replaced with
drivers/gpu/drm/gma500/. Thanks for the fix however
The patch was prepared against 3.2-rc6 and at the time of preparing the patch that was the latest rc release.
Thanks,
Rakib
Quoted 13 lines · Rakib Mullick
Quoted 12 lines · Alan Cox
Quoted 8 lines · On Fri, 23 Dec 2011 00:46:45 +0600 Rakib Mullick <[email protected]>…
gma_resume_display() wants 'struct
pci_dev*' as it's parameter, so lets passdev->pdevinstead 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 typedrivers/staging/gma500/power.c:99:13: note: expected ‘structpci_dev*’ but argument is of type ‘structdrm_device*’
Quoted 6 lines
Quoted 3 lines
This staging driver is now dead and replaced with
drivers/gpu/drm/gma500/. Thanks for the fix howeverThe patch was prepared against 3.2-rc6 and at the time of preparing the patch that was the latest rc release.
Do I have to resend the patch, prepared against -rc7? Patch is on it's way towards mainline through linux-next (Greg took it in his tree previously). It might conflict during merging, not sure. If requires I can send it again.
Thanks,
Rakib
Quoted 4 lines
Do I have to resend the patch, prepared against -rc7? Patch is on it's way towards mainline through linux-next (Greg took it in his tree previously). It might conflict during merging, not sure. If requires I can send it again.
What I meant was that the old driver is marked BROKEN for -next (ie won't be built), and in fact I sent GregKH a request to delete it.
The driver in updated form has moved to drivers/gpu/drm/gma500 in the -next tree.
Alan