[PATCH next] staging: gma500: fix build according to drm changes

[PATCH next] staging: gma500: fix build according to drm changes

[Alexander Beregalov]

Commit 8410ea3b (drm: rework PCI/platform driver interface.)
changed drm_driver structure. Fix build according to these changes.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/staging/gma500/psb_drv.c |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index 2b410af..9214e47 100644
--- a/drivers/staging/gma500/psb_drv.c
+++ b/drivers/staging/gma500/psb_drv.c
@@ -1605,6 +1605,18 @@ static const struct dev_pm_ops psb_pm_ops = {
 	.runtime_idle = psb_runtime_idle,
 };
 
+static struct pci_driver psb_pci_driver = {
+	.name = DRIVER_NAME,
+	.id_table = pciidlist,
+	.resume = ospm_power_resume,
+	.suspend = ospm_power_suspend,
+	.probe = psb_probe,
+	.remove = psb_remove,
+#ifdef CONFIG_PM
+	.driver.pm = &psb_pm_ops,
+#endif
+};
+
 static struct drm_driver driver = {
 	.driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \
 			   DRIVER_IRQ_VBL | DRIVER_MODESET,
@@ -1642,17 +1654,9 @@ static struct drm_driver driver = {
 		 .fasync = drm_fasync,
 		 .read = drm_read,
 		 },
-	.pci_driver = {
-		       .name = DRIVER_NAME,
-		       .id_table = pciidlist,
-		       .resume = ospm_power_resume,
-		       .suspend = ospm_power_suspend,
-		       .probe = psb_probe,
-		       .remove = psb_remove,
-#ifdef CONFIG_PM
-			.driver.pm = &psb_pm_ops,
-#endif
-		       },
+	.kdriver = {
+		.pci = &psb_pci_driver,
+		},
 	.name = DRIVER_NAME,
 	.desc = DRIVER_DESC,
 	.date = PSB_DRM_DRIVER_DATE,
@@ -1671,12 +1675,12 @@ static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 static int __init psb_init(void)
 {
-	return drm_init(&driver);
+	return drm_pci_init(&driver, &psb_pci_driver);
 }
 
 static void __exit psb_exit(void)
 {
-	drm_exit(&driver);
+	drm_pci_exit(&driver, &psb_pci_driver);
 }
 
 late_initcall(psb_init);
-- 
1.7.4.1

Re: [PATCH next] staging: gma500: fix build according to drm changes

[Alexander Beregalov]

On 7 March 2011 05:41, Alexander Beregalov <a.beregalov@gmail.com> wrote:
> Commit 8410ea3b (drm: rework PCI/platform driver interface.)
> changed drm_driver structure. Fix build according to these changes.
>

Sorry, I forget to check LKML first, there is a patch already.

Re: [PATCH next] staging: gma500: fix build according to drm changes

[Greg KH]

On Mon, Mar 07, 2011 at 05:48:10AM +0300, Alexander Beregalov wrote:
> On 7 March 2011 05:41, Alexander Beregalov <a.beregalov@gmail.com> wrote:
> > Commit 8410ea3b (drm: rework PCI/platform driver interface.)
> > changed drm_driver structure. Fix build according to these changes.
> >
> 
> Sorry, I forget to check LKML first, there is a patch already.

Yeah, I really can't apply it until the merge window time, sorry.

thanks,

greg k-h