From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: Re: [PATCH 05/50] drm/omap: call drm_put_dev directly in ->remove Date: Wed, 11 Dec 2013 07:02:22 -0500 Message-ID: References: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> <1386758111-3446-6-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pb0-f51.google.com (mail-pb0-f51.google.com [209.85.160.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E979FB788 for ; Wed, 11 Dec 2013 04:02:23 -0800 (PST) Received: by mail-pb0-f51.google.com with SMTP id up15so9869310pbc.10 for ; Wed, 11 Dec 2013 04:02:23 -0800 (PST) In-Reply-To: <1386758111-3446-6-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Daniel Vetter Cc: DRI Development List-Id: dri-devel@lists.freedesktop.org On Wed, Dec 11, 2013 at 5:34 AM, Daniel Vetter 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 > Signed-off-by: Daniel Vetter > --- > 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 >