From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CE37DC433F5 for ; Thu, 3 Mar 2022 22:54:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA1DA10E345; Thu, 3 Mar 2022 22:54:15 +0000 (UTC) Received: from mail-oo1-xc32.google.com (mail-oo1-xc32.google.com [IPv6:2607:f8b0:4864:20::c32]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C80710E3BD for ; Thu, 3 Mar 2022 22:54:15 +0000 (UTC) Received: by mail-oo1-xc32.google.com with SMTP id j7-20020a4ad6c7000000b0031c690e4123so7456475oot.11 for ; Thu, 03 Mar 2022 14:54:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=SWwr6PfQx9+FPyvTdo8KBfSMVcyO3fHRr3T3bQXm+ds=; b=QBW+znNKKa/bk/d9EArBF7hxjYyQk4nEwGsuQPFy4XkOyGaGnr2MqkogedjMGH6P6x IDtN+u+8Ykw/r3Mgxm1L+pc7zVn/aMdZjDLZ2isamgiU7xVKEAtCY7dXqnJkd5RQpCh+ 8Y5Yl4c26VGBMMpyT8YAIzoZVEcGktlM9tX18= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=SWwr6PfQx9+FPyvTdo8KBfSMVcyO3fHRr3T3bQXm+ds=; b=Z1kJ+GCwyTTgr6cFyKIEJDYWzSBC+4Umwr6Ecvr7/wmdnHpt8HuugPZVlApG2Wq7V4 EBn9Ad42is/JpSZkeUO3pWNCH/Aoll2lZfm4PAENSVs4BYJ7C4JJ/gHAeYDT/hFqPbN+ jozcXFPD9tmh+CxIq6r4/Qj6Zjvzpk0i/RZg5A2tnVP4aakEGWVWVrWk+1J3U44cCdcd IRFXlpZag/OJMTZ9t0yn2UjG/FUOD1C9OAZuf3HvS0bffazRmK9USkF3Fe6PounFoKje mlNZCmjM6/8Bds02hDmBJwpSuU1DQq9aPaT3QGsBMBPxoz7JTqI620dMFw+eNe+OHETl PiAA== X-Gm-Message-State: AOAM530iDvw7vaZrx4r9gVKJU3QE6q/in+Y+Y2N8H0k8ZWjOo/ASR2oT L3hGo8276jbs5S6sJZzRK2WnsqmykroBDhtwAJjecA== X-Google-Smtp-Source: ABdhPJx/6Rxm4cp68BFJJFqy3CAujhE6UWDHQU3lHjqBYT+eQ18QrGqQbyqLY4SwEdptGIgYFgUpSCqce2VueXCbcBs= X-Received: by 2002:a05:6870:14cf:b0:d9:a9ce:92a9 with SMTP id l15-20020a05687014cf00b000d9a9ce92a9mr5886672oab.64.1646348054835; Thu, 03 Mar 2022 14:54:14 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 3 Mar 2022 14:54:14 -0800 MIME-Version: 1.0 In-Reply-To: <20220119224005.3104578-3-dmitry.baryshkov@linaro.org> References: <20220119224005.3104578-1-dmitry.baryshkov@linaro.org> <20220119224005.3104578-3-dmitry.baryshkov@linaro.org> From: Stephen Boyd User-Agent: alot/0.10 Date: Thu, 3 Mar 2022 14:54:14 -0800 Message-ID: Subject: Re: [PATCH v2 2/4] drm/msm: remove extra indirection for msm_mdss To: Abhinav Kumar , Bjorn Andersson , Dmitry Baryshkov , Rob Clark , Sean Paul Content-Type: text/plain; charset="UTF-8" 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 , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Quoting Dmitry Baryshkov (2022-01-19 14:40:03) > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index be06a62d7ccb..f18dfbb614f0 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -1211,19 +1212,32 @@ static int msm_pdev_probe(struct platform_device *pdev) > > switch (get_mdp_ver(pdev)) { > case KMS_MDP5: > - ret = msm_mdss_init(pdev, true); > + mdss = msm_mdss_init(pdev, true); > + if (IS_ERR(mdss)) { > + ret = PTR_ERR(mdss); > + platform_set_drvdata(pdev, NULL); > + > + return ret; > + } else { Drop else > + priv->mdss = mdss; > + pm_runtime_enable(&pdev->dev); > + } > break; > case KMS_DPU: > - ret = msm_mdss_init(pdev, false); > + mdss = msm_mdss_init(pdev, false); > + if (IS_ERR(mdss)) { > + ret = PTR_ERR(mdss); > + platform_set_drvdata(pdev, NULL); > + > + return ret; > + } else { > + priv->mdss = mdss; > + pm_runtime_enable(&pdev->dev); > + } This is the same so why can't it be done below in the deleted if (ret)? > break; > default: > - ret = 0; > break; > } > - if (ret) { > - platform_set_drvdata(pdev, NULL); > - return ret; > - } > > if (get_mdp_ver(pdev)) { > ret = add_display_components(pdev, &match); > diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h > index 2459ba479caf..0c341660941a 100644 > --- a/drivers/gpu/drm/msm/msm_kms.h > +++ b/drivers/gpu/drm/msm/msm_kms.h > @@ -239,50 +228,44 @@ int mdp5_mdss_parse_clock(struct platform_device *pdev, struct clk_bulk_data **c > return num_clocks; > } > > -int msm_mdss_init(struct platform_device *pdev, bool mdp5) > +struct msm_mdss *msm_mdss_init(struct platform_device *pdev, bool mdp5) Ah I see it will quickly become not static. Still should have static first and remove it here.