From: Alexander Beregalov <a.beregalov@gmail.com>
To: linux-kernel@vger.kernel.org, gregkh@suse.de
Cc: Alan Cox <alan@linux.intel.com>, Dave Airlie <airlied@gmail.com>,
Alexander Beregalov <a.beregalov@gmail.com>
Subject: [PATCH next] staging: gma500: fix build according to drm changes
Date: Mon, 7 Mar 2011 05:41:04 +0300 [thread overview]
Message-ID: <1299465664-7760-1-git-send-email-a.beregalov@gmail.com> (raw)
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
next reply other threads:[~2011-03-07 2:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-07 2:41 Alexander Beregalov [this message]
2011-03-07 2:48 ` Alexander Beregalov
2011-03-07 3:39 ` 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=1299465664-7760-1-git-send-email-a.beregalov@gmail.com \
--to=a.beregalov@gmail.com \
--cc=airlied@gmail.com \
--cc=alan@linux.intel.com \
--cc=gregkh@suse.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®