From patchwork Mon Mar 23 14:49:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11453117 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 215B0174A for ; Mon, 23 Mar 2020 14:50:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F41BF20753 for ; Mon, 23 Mar 2020 14:50:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="ZoXOYVue" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F41BF20753 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E5A746E13D; Mon, 23 Mar 2020 14:50:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id B916B6E134 for ; Mon, 23 Mar 2020 14:50:05 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id t7so12744205wrw.12 for ; Mon, 23 Mar 2020 07:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KU8DrPlTZNTuC+W70w/wc2yCM1x6JtYBUdXiu2Db7ig=; b=ZoXOYVueTCK8lDBqhYZt9MKgUkT0ILA19ouF2lL0QXYby00E/1mqaY/JjLbSeEnc4z 19DzsZ1jY7tNeRvAO8ZWR6gJrRPwtOsBqqneHbQ3XETs0YSNAaP5qaKE+5WtUv5SGX7b tEwZVKEvtCA/6GnRiQ3rJ8Bi6YzbRfUjwGO4U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KU8DrPlTZNTuC+W70w/wc2yCM1x6JtYBUdXiu2Db7ig=; b=M/UIpE1QZmLSykBdaqOo0wu09nJYtrg2DNH/K5NDozPHzYMK1ZqIdZRJjUJ7M3J+Eq vfafbwtkb/RVLny2liFhrawLmegf62Be5ou1jWgqyxADFkEdVNE7obBw1obedU8q8Seg BoBOu+otreuRXBVZ0WhAmRJXwiysRp6HwyeZ9wj35yIa5JaTnmwvtIaBg4+qvHT0ghs4 iTA9eeUFl37Pf2pgMUJyu2IScEJRF3OP2t86urILVqVFDEDM8X+dbfw5tn327Hs7eTCj jd0eovw2OqmgJYVO9Z1nLT8hHOd6OBZdaubF0A3JdDgUfQnVQu6rv/OUHNdi8CFsNQKF /wdg== X-Gm-Message-State: ANhLgQ2VRY2BKq15n+GYdbrofLfex7Dh6ESyJnUfprUq7h6W+cpCj79w NBm0Aud1Raa+cvcmOmsnEKJMxneVBvCqqQ== X-Google-Smtp-Source: ADFU+vtNFKSc/6C8CYwqrv5CbW3VuqH8IU1gOVCX4h2/O2tB1zfVmmKhCD6QPWek086wolyB0EsKsw== X-Received: by 2002:adf:edd2:: with SMTP id v18mr5941111wro.55.1584975003802; Mon, 23 Mar 2020 07:50:03 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s22sm20376522wmc.16.2020.03.23.07.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 07:50:03 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/51] drm/mipi_dbi: Use drmm_add_final_kfree in all drivers Date: Mon, 23 Mar 2020 15:49:04 +0100 Message-Id: <20200323144950.3018436-6-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> References: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Intel Graphics Development , Thomas Zimmermann , Daniel Vetter , Kamlesh Gurudasani , Sam Ravnborg , David Lechner Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" They all share mipi_dbi_release so we need to switch them all together. With this we can drop the final kfree from the release function. Aside, I think we could perhaps have a tiny additional helper for these mipi_dbi drivers, the first few lines around devm_drm_dev_init are all the same (except for the drm_driver pointer). Acked-by: Sam Ravnborg Reviewed-by: Noralf Trønnes Tested-by: Noralf Trønnes Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Daniel Vetter Cc: Eric Anholt Cc: David Lechner Cc: Kamlesh Gurudasani Cc: "Noralf Trønnes" Cc: Sam Ravnborg Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_mipi_dbi.c | 3 --- drivers/gpu/drm/tiny/hx8357d.c | 2 ++ drivers/gpu/drm/tiny/ili9225.c | 2 ++ drivers/gpu/drm/tiny/ili9341.c | 2 ++ drivers/gpu/drm/tiny/ili9486.c | 2 ++ drivers/gpu/drm/tiny/mi0283qt.c | 2 ++ drivers/gpu/drm/tiny/st7586.c | 2 ++ drivers/gpu/drm/tiny/st7735r.c | 2 ++ 8 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index ea929bc1e663..98d0af8376fd 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -589,13 +589,10 @@ EXPORT_SYMBOL(mipi_dbi_dev_init); */ void mipi_dbi_release(struct drm_device *drm) { - struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(drm); - DRM_DEBUG_DRIVER("\n"); drm_mode_config_cleanup(drm); drm_dev_fini(drm); - kfree(dbidev); } EXPORT_SYMBOL(mipi_dbi_release); diff --git a/drivers/gpu/drm/tiny/hx8357d.c b/drivers/gpu/drm/tiny/hx8357d.c index 9af8ff84974f..42bc5dadcb1c 100644 --- a/drivers/gpu/drm/tiny/hx8357d.c +++ b/drivers/gpu/drm/tiny/hx8357d.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include