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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 694E0C433F5 for ; Thu, 7 Apr 2022 09:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239198AbiDGJFg (ORCPT ); Thu, 7 Apr 2022 05:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230140AbiDGJFZ (ORCPT ); Thu, 7 Apr 2022 05:05:25 -0400 Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D87718E00 for ; Thu, 7 Apr 2022 02:03:24 -0700 (PDT) Received: by mail-ed1-x541.google.com with SMTP id g20so5612623edw.6 for ; Thu, 07 Apr 2022 02:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=W+1rOYPnAZkSAoFE9WFZU5G0otnwYX5qic+yQYdsVYw=; b=ikVAtHHNfS1qoYViGuL94fCuQ8C+sS0IgCobHN4E5+VSj6BZL+yj96oOWGAUUkJR6j NRB1pT3xl3CiOTSvTd6VKHK50u0XaKBOmFDpQNAb1T85d611C2juxICUAgCCXG7prKLe nXmGV880tstI6aOa/b2NvPHEJAJZP0kATx3Sg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=W+1rOYPnAZkSAoFE9WFZU5G0otnwYX5qic+yQYdsVYw=; b=qteXlEZgYA/pw5rwI6qBNqfsB2C6+76cUn/zssNsw39IIsjyJA8gWw6TBAHouvP8NU ScGKk3mJD5iVSE4cZgjsqDdopLO/LWDogDA8BgdXWYBPuY3KzlrpFKiLX4o2cgeyB0Oz Z1axkl0lViI4ng0ncasfSDs3nGZUWkU4kJzs6vTaogTbwAMa6XEg1yG4MXAES89FWJoD DnvPz/R7lL9ldJ6yt7TZvQYIvoHgl2lixdw3Nq6HMDUxtIaAcmS7LVpjsgR2qADKDUrO R/cPrmFmMb2WEETnnCxfWkbm/orXTrtt5aMxZgQGnU+cyBY424HfpvGqhoplH2rfevOq bCsQ== X-Gm-Message-State: AOAM530NTH0/knoOr5mMh4nLCuA6uBtQSm3Nm6Ue4+4sEowF552a6kAe fm8oavndYPNGEYtsUsEUYO0l8nd809VYa7HGhzY= X-Google-Smtp-Source: ABdhPJwiSCGjhBdoXYK5Nvas9Re2eGRnUUUVEvu1QLTjngawJF0jewMmPTqZfm9TwzhKEP8c0Pm7GQ== X-Received: by 2002:a05:6402:438d:b0:419:4550:d52b with SMTP id o13-20020a056402438d00b004194550d52bmr12998429edc.83.1649322203124; Thu, 07 Apr 2022 02:03:23 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id f13-20020a50bf0d000000b0041cdd9c9147sm3857173edk.40.2022.04.07.02.03.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 02:03:22 -0700 (PDT) Date: Thu, 7 Apr 2022 11:03:20 +0200 From: Daniel Vetter To: Javier Martinez Canillas Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann , Daniel Vetter , Borislav Petkov , Greg Kroah-Hartman , Miaoqian Lin Subject: Re: [RESEND RFC PATCH 1/5] firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer Message-ID: Mail-Followup-To: Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann , Borislav Petkov , Greg Kroah-Hartman , Miaoqian Lin References: <20220406213919.600294-1-javierm@redhat.com> <20220406213919.600294-2-javierm@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220406213919.600294-2-javierm@redhat.com> X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 06, 2022 at 11:39:15PM +0200, Javier Martinez Canillas wrote: > This function just returned 0 on success or an errno code on error, but it > could be useful to sysfb_init() to get a pointer to the device registered. > > Signed-off-by: Javier Martinez Canillas You need to rebase this onto 202c08914ba5 ("firmware: sysfb: fix platform-device leak in error path") which fixes the same error path leak you are fixing in here too. Or we just have a neat conflict when merging :-) But in that case please mention that you fix the error path leak too so it's less confusing when Linus or someone needs to resolve the conflict. Anyway Reviewed-by: Daniel Vetter > --- > > drivers/firmware/sysfb.c | 4 ++-- > drivers/firmware/sysfb_simplefb.c | 24 +++++++++++++++--------- > include/linux/sysfb.h | 10 +++++----- > 3 files changed, 22 insertions(+), 16 deletions(-) > > diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c > index 2bfbb05f7d89..b032f40a92de 100644 > --- a/drivers/firmware/sysfb.c > +++ b/drivers/firmware/sysfb.c > @@ -46,8 +46,8 @@ static __init int sysfb_init(void) > /* try to create a simple-framebuffer device */ > compatible = sysfb_parse_mode(si, &mode); > if (compatible) { > - ret = sysfb_create_simplefb(si, &mode); > - if (!ret) > + pd = sysfb_create_simplefb(si, &mode); > + if (!IS_ERR(pd)) > return 0; > } > > diff --git a/drivers/firmware/sysfb_simplefb.c b/drivers/firmware/sysfb_simplefb.c > index 76c4abc42a30..c42648ed3aad 100644 > --- a/drivers/firmware/sysfb_simplefb.c > +++ b/drivers/firmware/sysfb_simplefb.c > @@ -57,8 +57,8 @@ __init bool sysfb_parse_mode(const struct screen_info *si, > return false; > } > > -__init int sysfb_create_simplefb(const struct screen_info *si, > - const struct simplefb_platform_data *mode) > +__init struct platform_device *sysfb_create_simplefb(const struct screen_info *si, > + const struct simplefb_platform_data *mode) > { > struct platform_device *pd; > struct resource res; > @@ -76,7 +76,7 @@ __init int sysfb_create_simplefb(const struct screen_info *si, > base |= (u64)si->ext_lfb_base << 32; > if (!base || (u64)(resource_size_t)base != base) { > printk(KERN_DEBUG "sysfb: inaccessible VRAM base\n"); > - return -EINVAL; > + return ERR_PTR(-EINVAL); > } > > /* > @@ -93,7 +93,7 @@ __init int sysfb_create_simplefb(const struct screen_info *si, > length = mode->height * mode->stride; > if (length > size) { > printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n"); > - return -EINVAL; > + return ERR_PTR(-EINVAL); > } > length = PAGE_ALIGN(length); > > @@ -104,25 +104,31 @@ __init int sysfb_create_simplefb(const struct screen_info *si, > res.start = base; > res.end = res.start + length - 1; > if (res.end <= res.start) > - return -EINVAL; > + return ERR_PTR(-EINVAL); > > pd = platform_device_alloc("simple-framebuffer", 0); > if (!pd) > - return -ENOMEM; > + return ERR_PTR(-ENOMEM); > > sysfb_apply_efi_quirks(pd); > > ret = platform_device_add_resources(pd, &res, 1); > if (ret) { > platform_device_put(pd); > - return ret; > + return ERR_PTR(ret); > } > > ret = platform_device_add_data(pd, mode, sizeof(*mode)); > if (ret) { > platform_device_put(pd); > - return ret; > + return ERR_PTR(ret); > } > > - return platform_device_add(pd); > + ret = platform_device_add(pd); > + if (ret) { > + platform_device_put(pd); > + return ERR_PTR(ret); > + } > + > + return pd; > } > diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h > index b0dcfa26d07b..708152e9037b 100644 > --- a/include/linux/sysfb.h > +++ b/include/linux/sysfb.h > @@ -72,8 +72,8 @@ static inline void sysfb_apply_efi_quirks(struct platform_device *pd) > > bool sysfb_parse_mode(const struct screen_info *si, > struct simplefb_platform_data *mode); > -int sysfb_create_simplefb(const struct screen_info *si, > - const struct simplefb_platform_data *mode); > +struct platform_device *sysfb_create_simplefb(const struct screen_info *si, > + const struct simplefb_platform_data *mode); > > #else /* CONFIG_SYSFB_SIMPLE */ > > @@ -83,10 +83,10 @@ static inline bool sysfb_parse_mode(const struct screen_info *si, > return false; > } > > -static inline int sysfb_create_simplefb(const struct screen_info *si, > - const struct simplefb_platform_data *mode) > +static inline struct platform_device *sysfb_create_simplefb(const struct screen_info *si, > + const struct simplefb_platform_data *mode) > { > - return -EINVAL; > + return ERR_PTR(-EINVAL); > } > > #endif /* CONFIG_SYSFB_SIMPLE */ > -- > 2.35.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch