From patchwork Wed Feb 19 10:21:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11391085 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 5B928930 for ; Wed, 19 Feb 2020 10:23:24 +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 3A0A124658 for ; Wed, 19 Feb 2020 10:23:24 +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="fDw8UiD2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A0A124658 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 6A8A06EB96; Wed, 19 Feb 2020 10:22:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC4CC6EB54 for ; Wed, 19 Feb 2020 10:22:12 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id n3so3667457wmk.4 for ; Wed, 19 Feb 2020 02:22:12 -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=TINQTtNWQ1MjVJ1+HAR2tzhjIndOHUAc38+fw2BOHX4=; b=fDw8UiD2JAF+ht4GPJfkm1fLdHQ9PU6Cef3kE5aca/4oLmA7qJ1O6zdH4h7b47Op9S U8gdD8LL6569/PZGwCM+1RaTLL305czsdMd0saA+wNW42H84WIgXVBwXrVesAcw0C3Ke oqwOAfph472CepGzMID7u/qtgM8u74WayJKK4= 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=TINQTtNWQ1MjVJ1+HAR2tzhjIndOHUAc38+fw2BOHX4=; b=kB/5R19+AsnrlfEy5gYlHoq/rEZva4dusQ3zaNxVipP+nP5Y5IoJ1u9qDDvs0R/xeo zlOJr7PWoZFrV33vZWtQAnXn3oD/zxBHGDdkkBOdUwD4UKJr3zcwrh+UZ8MG7zQ/88eZ vFkuru8pcUYvTVGQV8agWG/omOBwyTP6ldilBwgn/0T+nMJ6mLesahivH7UX0PIfAeik MgRMGgT/pNDVj1dJiVy/dHiFqXuWF7emO3cRNbK9FVpoaHpHLjMwvTNnjEgnNsmJn9ZI S0WpwANodom5aCVTLzSBlW4dsK9+QWsu4utdR0TsbZa1vvnYuC6VhvvaB0qrd3IJLc2l hTrQ== X-Gm-Message-State: APjAAAW3EdVaqBKa00Dunuu/JNgM7uhzp1wLH9DUELRW0hp9QP3472gJ NLmmRjj+Ui36lrQxAuwhWySkqC9FLy8= X-Google-Smtp-Source: APXvYqxGgE1TW6rrE6O8gA8msFqmxfxABgg6VcnkzgaigdgxDoZxL3h7lzeFw4hVlHgCAWcMBqNQ2w== X-Received: by 2002:a1c:a4c3:: with SMTP id n186mr9193721wme.25.1582107729692; Wed, 19 Feb 2020 02:22:09 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s23sm2370339wra.15.2020.02.19.02.22.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 02:22:09 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 32/52] drm/ingenic: Drop explicit drm_mode_config_cleanup call Date: Wed, 19 Feb 2020 11:21:02 +0100 Message-Id: <20200219102122.1607365-33-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219102122.1607365-1-daniel.vetter@ffwll.ch> References: <20200219102122.1607365-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: Paul Cercueil , Daniel Vetter , Intel Graphics Development , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Allows us to drop the drm_driver.release callback. Signed-off-by: Daniel Vetter Cc: Paul Cercueil --- drivers/gpu/drm/ingenic/ingenic-drm.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c b/drivers/gpu/drm/ingenic/ingenic-drm.c index 06c195af714e..587369f6c0d7 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm.c @@ -489,11 +489,6 @@ static irqreturn_t ingenic_drm_irq_handler(int irq, void *arg) return IRQ_HANDLED; } -static void ingenic_drm_release(struct drm_device *drm) -{ - drm_mode_config_cleanup(drm); -} - static int ingenic_drm_enable_vblank(struct drm_crtc *crtc) { struct ingenic_drm *priv = drm_crtc_get_priv(crtc); @@ -537,7 +532,6 @@ static struct drm_driver ingenic_drm_driver_data = { .gem_prime_mmap = drm_gem_cma_prime_mmap, .irq_handler = ingenic_drm_irq_handler, - .release = ingenic_drm_release, }; static const struct drm_plane_funcs ingenic_drm_primary_plane_funcs = { @@ -638,7 +632,10 @@ static int ingenic_drm_probe(struct platform_device *pdev) } drmm_add_final_kfree(drm, priv); - drm_mode_config_init(drm); + ret = drm_mode_config_init(drm); + if (ret) + return ret; + drm->mode_config.min_width = 0; drm->mode_config.min_height = 0; drm->mode_config.max_width = soc_info->max_width;