From patchwork Mon Mar 2 22:26:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11416683 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 22C2F14B4 for ; Mon, 2 Mar 2020 22:28:42 +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 0145720866 for ; Mon, 2 Mar 2020 22:28:42 +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="ay8a/hy5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0145720866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 164C06E8DD; Mon, 2 Mar 2020 22:27:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id D30B76E8FE for ; Mon, 2 Mar 2020 22:27:38 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id a132so853978wme.1 for ; Mon, 02 Mar 2020 14:27:38 -0800 (PST) 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=O4v1bB2ProjScxSH7lrmq+qyIDYXGTRLSSgce7Pbvog=; b=ay8a/hy5iO6HDppeMxuAvsVWkjp2SWaBKM5TWxtdEqGXWmmG0rPnZJZaBQ+zxDANsJ G2sQAEvRdVmbHs/6tTZKiID+WXByu3PTzofqVsIyOIXkYQ6TqgsP0x9HKxPhr5gNQEfW hRC/N+WCXl3Dxj1UQ3h9svogvGlN5HG+R4vaw= 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=O4v1bB2ProjScxSH7lrmq+qyIDYXGTRLSSgce7Pbvog=; b=jQOtpbNDvnC9dmhpJPdj6O/y4ZgjciNwivjwdOS2BUIfdQElraRr2rT2kFNc5DNfnt ePJiGZg+PqD2I5B0mfxpeBvBI0/itYr+g1rwr42+lWGEGBAI2/l/5FwxoOqlwxp2+TJf vvSB6SuPnMvMyKnT+GHYt5RtxtIjgWdgFYayn2WOaO/ST6JBLjM3HM47k0Hjq9zhQ7ln UF50GfBbd0z/+8ULakVjPk9i3UDIKGFlJlIkSwUe1OHg8N7StuO+UiYnAZC4cFo+zkI2 tVnyyVmb2HA3FUUsUuZRGvgrJX/TFnNxwP9fh0EF06XJReMckwb8MzmT2rDDhCFCd/Bl gZJQ== X-Gm-Message-State: ANhLgQ0gqBBjx+Tz2koa7wTo35tSYW5wJAZf49g5Q6PrfaVRJC7UPg7b wTlL09lom+km5qDJQd2AWEHvCdBagFE= X-Google-Smtp-Source: ADFU+vtOyhWFPW827dy+fApK9iO/pQPx3iptUJ67lo7IUrQxMeCCwAuV+GZebYRGL7zKTPaDq4fFFw== X-Received: by 2002:a7b:c249:: with SMTP id b9mr479643wmj.61.1583188057354; Mon, 02 Mar 2020 14:27:37 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id o18sm26114589wrv.60.2020.03.02.14.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 14:27:36 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Mon, 2 Mar 2020 23:26:26 +0100 Message-Id: <20200302222631.3861340-47-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> References: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 46/51] drm/repaper: Drop explicit drm_mode_config_cleanup call X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , =?utf-8?q?Nor?= =?utf-8?q?alf_Tr=C3=B8nnes?= , Laurent Pinchart , Thomas Zimmermann , Daniel Vetter , Sam Ravnborg Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Allows us to drop the drm_driver.release callback. This is made possible by a preceeding patch which added a drmm_ cleanup action to drm_mode_config_init(), hence all we need to do to ensure that drm_mode_config_cleanup() is run on final drm_device cleanup is check the new error code for _init(). v2: Explain why this cleanup is possible (Laurent). v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) I also noticed that I've failed to add the error checking, __must_check caught that. Cc: Sam Ravnborg Cc: Thomas Zimmermann Cc: Laurent Pinchart Reviewed-by: Noralf Trønnes (v2) Signed-off-by: Daniel Vetter Cc: "Noralf Trønnes" Acked-by: Sam Ravnborg --- drivers/gpu/drm/tiny/repaper.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/tiny/repaper.c b/drivers/gpu/drm/tiny/repaper.c index 4741ff670ec9..862c3ee6055d 100644 --- a/drivers/gpu/drm/tiny/repaper.c +++ b/drivers/gpu/drm/tiny/repaper.c @@ -909,13 +909,6 @@ static const struct drm_mode_config_funcs repaper_mode_config_funcs = { .atomic_commit = drm_atomic_helper_commit, }; -static void repaper_release(struct drm_device *drm) -{ - DRM_DEBUG_DRIVER("\n"); - - drm_mode_config_cleanup(drm); -} - static const uint32_t repaper_formats[] = { DRM_FORMAT_XRGB8888, }; @@ -953,7 +946,6 @@ DEFINE_DRM_GEM_CMA_FOPS(repaper_fops); static struct drm_driver repaper_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &repaper_fops, - .release = repaper_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, .name = "repaper", .desc = "Pervasive Displays RePaper e-ink panels", @@ -1023,7 +1015,9 @@ static int repaper_probe(struct spi_device *spi) } drmm_add_final_kfree(drm, epd); - drm_mode_config_init(drm); + ret = drmm_mode_config_init(drm); + if (ret) + return ret; drm->mode_config.funcs = &repaper_mode_config_funcs; epd->spi = spi;