| Message ID | 1386758111-3446-6-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Dec 11, 2013 at 5:34 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Again omap already sets the driver data pointer to the drm_device. > > Also drop the driver unregister call, that should be (and already is) > done in the module unload hook. umm.. there are two devices+drivers at play in there. The dmm/tiler is split out into a different device (mainly just because it's irq and memory resources were associated to a different device). The one that is dropped in omap_drm_fini() is the toplevel drm device, not the *dmm* driver (for extra fun, use a really small font and try to tell the difference between dmm and drm ;-)) BR, -R > > Cc: Rob Clark <robdclark@gmail.com> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index e7fa3cd96743..13f294aeaefd 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -665,9 +665,9 @@ static int pdev_probe(struct platform_device *device) > static int pdev_remove(struct platform_device *device) > { > DBG(""); > - drm_platform_exit(&omap_drm_driver, device); > > - platform_driver_unregister(&omap_dmm_driver); > + drm_put_dev(platform_get_drvdata(device)); > + > return 0; > } > > -- > 1.8.4.3 >
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index e7fa3cd96743..13f294aeaefd 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -665,9 +665,9 @@ static int pdev_probe(struct platform_device *device) static int pdev_remove(struct platform_device *device) { DBG(""); - drm_platform_exit(&omap_drm_driver, device); - platform_driver_unregister(&omap_dmm_driver); + drm_put_dev(platform_get_drvdata(device)); + return 0; }
Again omap already sets the driver data pointer to the drm_device. Also drop the driver unregister call, that should be (and already is) done in the module unload hook. Cc: Rob Clark <robdclark@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)