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 A5FA6C433F5 for ; Wed, 20 Apr 2022 08:53:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376999AbiDTI4S (ORCPT ); Wed, 20 Apr 2022 04:56:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352956AbiDTI4H (ORCPT ); Wed, 20 Apr 2022 04:56:07 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E34B13B2B3 for ; Wed, 20 Apr 2022 01:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650444800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XLz0G110FIfASO+iYCUFHr5GunjUpMHPsHrzLY9s3vE=; b=PBAK8kfQoRf8ynI21X9JYzNKNfoBMvRP6mV1bH8RjHPew0UIvMB5m39Dytxso74wH5qWPu JsGZoRJD5CjtadofWUoIdXp1RLAtlPTp+b4bJb46Lbp5j27aNA6NhRzNQq4Qu4JXy9h4F9 NYvwCSEpetwEabPswWDagzKRtCs453g= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-218-KNHSgbjcMGm_NxyI60wJOw-1; Wed, 20 Apr 2022 04:53:17 -0400 X-MC-Unique: KNHSgbjcMGm_NxyI60wJOw-1 Received: by mail-wr1-f71.google.com with SMTP id m17-20020adfa3d1000000b0020aaff06d3bso191660wrb.22 for ; Wed, 20 Apr 2022 01:53:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XLz0G110FIfASO+iYCUFHr5GunjUpMHPsHrzLY9s3vE=; b=sGbnUpwl5APjjzCsZ0CaCfM3uUKuIOHyBYJcnviHnhikTXQn+sUp6ZVs4N+Ytbetmg mjsgOK7x2nmjFbwXnWWdE2G3Son08oE58qtLRGAq0/gvym2AlfU4e7iE5349CA/sR51S qxLU6I0kpkVwvG9lZ8IBDb+d3rvFJhUgmEBxv9o1JxQWr6LrRFNjdcF9/30KCm94idgl AMx1rwSVUmx6CqwdKIkRIyAjnMZK27DA4/jk6PaQqUJZP924aX07qisvGEy+4ZLQSJBJ 1E+X5gy5fNlM/Ps45E4tj6rM4JcaAE0ElZuINFyLFRoKsn7X+uT/h07gduSTH8KI7uUf Wb1g== X-Gm-Message-State: AOAM532NJqfEvOG3jQGSC/bVEAsZPpiPF4JumLZgIabjCBkAb2RxOMVV J5pxlIKJh4v3FIPVNMVs2Vg5B0vNww7jc9tYUqtZtOGFQ1hZJNZGPxNzRQLtcGsCbzu99+MBLzF EsgiKJiDXCK39tdymq341yL0uIKTqH00cdyUgpoKQMfesbSePeEq+ayD58aWYPxUM/Rcx6+TWc0 M= X-Received: by 2002:a05:6000:381:b0:20a:8a52:5c86 with SMTP id u1-20020a056000038100b0020a8a525c86mr13748756wrf.554.1650444796592; Wed, 20 Apr 2022 01:53:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLr++p406eM0f6+U3Y3BY+kkRFz4V3k6cnvH2oKtp+1NlXXl61MnZBiijK/mowG7DRyB16og== X-Received: by 2002:a05:6000:381:b0:20a:8a52:5c86 with SMTP id u1-20020a056000038100b0020a8a525c86mr13748731wrf.554.1650444796338; Wed, 20 Apr 2022 01:53:16 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id i14-20020a0560001ace00b0020aac00f862sm1895343wry.98.2022.04.20.01.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 01:53:16 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Daniel Vetter , dri-devel@lists.freedesktop.org, Thomas Zimmermann , Javier Martinez Canillas , Borislav Petkov , Johan Hovold , Miaoqian Lin Subject: [PATCH v3 1/5] firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer Date: Wed, 20 Apr 2022 10:52:59 +0200 Message-Id: <20220420085303.100654-2-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220420085303.100654-1-javierm@redhat.com> References: <20220420085303.100654-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function just returned 0 on success or an errno code on error, but it could be useful for sysfb_init() callers to have a pointer to the device. Signed-off-by: Javier Martinez Canillas Reviewed-by: Daniel Vetter --- (no changes since v2) Changes in v2: - Rebase on top of latest drm-misc-next and fix conflicts (Daniel Vetter). drivers/firmware/sysfb.c | 4 ++-- drivers/firmware/sysfb_simplefb.c | 16 ++++++++-------- include/linux/sysfb.h | 10 +++++----- 3 files changed, 15 insertions(+), 15 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 bda8712bfd8c..a353e27f83f5 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,11 +104,11 @@ __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); @@ -124,10 +124,10 @@ __init int sysfb_create_simplefb(const struct screen_info *si, if (ret) goto err_put_device; - return 0; + return pd; err_put_device: platform_device_put(pd); - return ret; + return ERR_PTR(ret); } 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