Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp543760ybv; Fri, 7 Feb 2020 04:15:23 -0800 (PST) X-Google-Smtp-Source: APXvYqyfgFnGJITspBxOhYp1meqQF0f1gKk0xDw49weh4oEnL9dJi4S/bPVFm0YIDWLHKbXHSIKz X-Received: by 2002:a05:6808:8d5:: with SMTP id k21mr1909300oij.121.1581077723304; Fri, 07 Feb 2020 04:15:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581077723; cv=none; d=google.com; s=arc-20160816; b=0BJ9mu5YQl29NqdfWclWColvWCRVjVCxt6/52Kyl7cmJ4mezvtX7VXkl3ZDHMpFdyJ x+3D0NihIevqgM04xB9GlMCcn4lIuNHtLpqzWHOqsRz3KenQ7cK858S4VP4Rey3isy7B 0JKzEBeCOcJw0G4Z9hpe/w86QczQW33XocoRlSEpmFF+vcvyRxFjcA1d15c+sySKHxo2 Dmu2kozbSH7Goiy7Z3t3aNlpW0Spqhu48upKjiEmHWDhu1EjaqhDHdztY/w8Q+2oIcbE /N/qX2PKYmXX6GrQ4pG3mhEno/083Ox6tvm7BsJ1uJ5rkV0TjeqEn/CEtx61tpOjvYh0 iuwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=aOOYqVPrj4S2St31AUk2Ye43S8BIUm6kjTFmGx5Z+/A=; b=mdwvxiV4uWQOJVkm0mUM3Dbcvv8qyf8/lXWJeTal/pHcjYB+YcgIE5Q0QhEnDha+07 71L1Pvurs2oMnBPW7Cz5D0E5ZE0fWwVEApyd+KZ+n7Bcye9z80wmQLkhoVhw9kqFm5zq jyNDDhT0jpE8u8uH29AI3g2H6GRtfkS+5MthPYlfOMv33JydCK8RCgms6oCXviB+3sK7 0yQZhdjRGEhbwa+rb4GdgvL7FGJyi8HknENxdz4aS/z4b6ROjGngEqIlcvi5w1TQQujS Dn4CIeOIBW6XwRa2oJVg4j0IWwpVxzWbkz2yPcSGp2MJa/MrVGr7MnrChFKK+5fljJiB dFUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WLIhQ+mY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t20si1432047otr.64.2020.02.07.04.15.11; Fri, 07 Feb 2020 04:15:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WLIhQ+mY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726901AbgBGMNX (ORCPT + 99 others); Fri, 7 Feb 2020 07:13:23 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:31674 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726674AbgBGMNX (ORCPT ); Fri, 7 Feb 2020 07:13:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581077602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=aOOYqVPrj4S2St31AUk2Ye43S8BIUm6kjTFmGx5Z+/A=; b=WLIhQ+mY3zLrfH5TZB0DndJ27dbNoHT8mqzT+nRKEcAY7gew8Mfd6sjzi9DqMCsTSnI9hH zFkpT+59ukBr5SDel66+GRihZudfaPudOA2G229sRhTaZWsdw8wb2aiz6fs4fOHaOICsRO gaZPYuwtKxlp3w2di6KvlFVxJyOP6z0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-drYNRWgjMKmihOmabsGQuw-1; Fri, 07 Feb 2020 07:13:17 -0500 X-MC-Unique: drYNRWgjMKmihOmabsGQuw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53A051088397; Fri, 7 Feb 2020 12:13:16 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-112.ams2.redhat.com [10.36.116.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 978D9790F2; Fri, 7 Feb 2020 12:13:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C03591747D; Fri, 7 Feb 2020 13:13:12 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gurchetan Singh , Gerd Hoffmann , David Airlie , Daniel Vetter , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR BOCHS VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/bochs: add drm_driver.release callback. Date: Fri, 7 Feb 2020 13:13:12 +0100 Message-Id: <20200207121312.25296-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gurchetan Singh Move bochs_unload call from bochs_remove() to the new bochs_release() callback. Also call drm_dev_unregister() first in bochs_remove(). Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/bochs/bochs_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index 10460878414e..87ee1eb21a4d 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -60,6 +60,11 @@ static int bochs_load(struct drm_device *dev) DEFINE_DRM_GEM_FOPS(bochs_fops); +static void bochs_release(struct drm_device *dev) +{ + bochs_unload(dev); +} + static struct drm_driver bochs_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &bochs_fops, @@ -69,6 +74,7 @@ static struct drm_driver bochs_driver = { .major = 1, .minor = 0, DRM_GEM_VRAM_DRIVER, + .release = bochs_release, }; /* ---------------------------------------------------------------------- */ @@ -148,9 +154,8 @@ static void bochs_pci_remove(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); - drm_atomic_helper_shutdown(dev); drm_dev_unregister(dev); - bochs_unload(dev); + drm_atomic_helper_shutdown(dev); drm_dev_put(dev); } -- 2.18.1