From patchwork Tue Jun 13 11:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107314 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp469057vqr; Tue, 13 Jun 2023 04:27:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4DaYtGMT5dRwPBfkO3DFgd058EB1ZmDDjis0/Scg5kxffS2z5B4SyTh1tgoxNa5x9g4xg3 X-Received: by 2002:a17:902:b949:b0:1af:b97c:2353 with SMTP id h9-20020a170902b94900b001afb97c2353mr7624141pls.15.1686655619685; Tue, 13 Jun 2023 04:26:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655619; cv=none; d=google.com; s=arc-20160816; b=SsDjVNTGU5dVKqcQa1RHkNSPdHj8P+OdHyJySt4p5Xe+rSoQhYdLLDmZsH1MQkvvXa CLRsL3pwhaDag7VpYY3qJbWdUAzolLDQ6fsbpD3cATYV61Sr5XFdUw8RZs2zLYSHKLaG izdmd1tTYzk4wDmNhfbZNSkLppGuQ0OL+1gk4As24SEFy/ippSN6S+6cR7YrW1asduc3 v1kyXc6hIlBcV7CPZ0SIHv09uZUfj1yL05/g7spId+4nI3b0eOLMyQNyMcyyBPB3grsP 2bvlUZVpZ1IrPFHfLffOvz18uaeYOh5zmnpstZ1NDwDQsQmEwzoCIwX3WTiCwcq0zGx6 X1+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=e8MeP5H9L/C35OSf16J0voEdztt3TBewcnlZK3MPUmk=; b=iRCBa0PvxPeFEWa14yyvfTbgamgoWJ/jMWGflXCTileJ5Qa07oFlaqPhYIMUwRvsd7 RxaA0oO47RNgnaYqJ34B74KJ6odtJG3Iw1s0sntGfTa2MN29CqdT+0kUJgoz9iuVEK1f HjX0dz7X4n4dfuHypCV5qEJy+Z2HbxabgogFO0N84WlW5kfSr8um9GTG9MaLdK2CrLJy QyoKNwl029uC2Y39BX2WSdq1991nXZAi4Tst1+2BhKfFhWq5hMu+E2He2S091OkPg7wp y0LUjBmlCds9DM0M8eIwcaG8D7SAguLhpHqifwB75LLclKOelnrXo/aeuhf1lP1tgvLn fqzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=q4mVicue; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b5-20020a170902d50500b001b176ba9f0fsi4789179plg.273.2023.06.13.04.26.47; Tue, 13 Jun 2023 04:26:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=q4mVicue; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239869AbjFMLVa (ORCPT + 99 others); Tue, 13 Jun 2023 07:21:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239098AbjFMLJ6 (ORCPT ); Tue, 13 Jun 2023 07:09:58 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C15D5E52; Tue, 13 Jun 2023 04:09:57 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7F4961FD8F; Tue, 13 Jun 2023 11:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654596; h=from:from:reply-to: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=e8MeP5H9L/C35OSf16J0voEdztt3TBewcnlZK3MPUmk=; b=q4mVicueGNrihIwywCBqXi/D+tB7n/3YvpZhyHvocEInbo1UdXuavORCBmxo/NqCQnyYwI LsY+F8fh1DgeEWQ8TJ6qr4c+g3aOzC6V6Qu5BE8K0ngDOUv0oNAvXQgVUMfDN5a9vbgicy iN9Q6z/eFI8el9/xOspCpXYb4m0ujjY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654596; h=from:from:reply-to: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=e8MeP5H9L/C35OSf16J0voEdztt3TBewcnlZK3MPUmk=; b=TkIc8u5ZMBX9W3NTehcBD967PaLbnxXs4zcFb3KUm/1b/89h5shMvLtfar2nl98R2XBxL8 KT/Dcu4p1tP+ppBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 257DA13A47; Tue, 13 Jun 2023 11:09:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sE80CIROiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:56 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Laurent Pinchart , stable@vger.kernel.org Subject: [PATCH v3 01/38] backlight/bd6107: Compare against struct fb_info.device Date: Tue, 13 Jun 2023 13:06:36 +0200 Message-ID: <20230613110953.24176-2-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586603313517611?= X-GMAIL-MSGID: =?utf-8?q?1768586603313517611?= Struct bd6107_platform_data refers to a platform device within the Linux device hierarchy. The test in bd6107_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device. Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional. v2: * move renames into separate patch (Javier, Sam, Michael) Fixes: 67b43e590415 ("backlight: Add ROHM BD6107 backlight driver") Signed-off-by: Thomas Zimmermann Cc: Laurent Pinchart Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: dri-devel@lists.freedesktop.org Cc: # v3.12+ Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg Reviewed-by: Daniel Thompson --- drivers/video/backlight/bd6107.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/backlight/bd6107.c b/drivers/video/backlight/bd6107.c index f4db6c064635b..e3410444ea235 100644 --- a/drivers/video/backlight/bd6107.c +++ b/drivers/video/backlight/bd6107.c @@ -104,7 +104,7 @@ static int bd6107_backlight_check_fb(struct backlight_device *backlight, { struct bd6107 *bd = bl_get_data(backlight); - return bd->pdata->fbdev == NULL || bd->pdata->fbdev == info->dev; + return bd->pdata->fbdev == NULL || bd->pdata->fbdev == info->device; } static const struct backlight_ops bd6107_backlight_ops = { From patchwork Tue Jun 13 11:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107310 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp467369vqr; Tue, 13 Jun 2023 04:23:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ48nuZ9+T2hbp9KQlPhggRCr2Mhdb9OO/qFPR1MlCD2Ara+7WyL8nI4D+XHifk73fMIrJrv X-Received: by 2002:a05:6a20:d38e:b0:10a:ba3a:42dd with SMTP id iq14-20020a056a20d38e00b0010aba3a42ddmr11861874pzb.44.1686655417002; Tue, 13 Jun 2023 04:23:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655416; cv=none; d=google.com; s=arc-20160816; b=M6Mejn1yEjnq1nlEJL7knD5GJAnAvaIodnQnk0pLEcbxe5MqW+qWu/TmZtfCqRSUTw f0X4n42Y6IUJUy7MuyMlXsWv5l/9h5NPo8uHY3YpyUNdHfKK+AhcG2KG/gT+jLg4WrkW mLeLyOlo0J3oUCRymtqwHKTNf75ax2j+TwFyS8Vg1FnbIYCMPZDW24cvrDJDQct7VzFJ OFJecMBUkzsbIKdK/Pb0okwTo3bnsI9DrvjNgiuV/9wQ1nunIJQEfzdxooYNcbZaB3jT pgv7ZZR2pv0JlNN+RKxhVT/bfiLjRoalJKmNjMbJppUtkcULRPZEeFTJXEI8AyCkmXdc caZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=+MI7Ni+qjWp8SvGCdzhLbAUt0sOV82JpEEinTZWk2UY=; b=Q9VDOl6LWrDqKrr9Nqw6pk7W/EO+lwVaIxSHdk0QdqESzS2aa00XcSerZoKHIN/0RY V3hzPEEyhLAz+4y/LDjC5eOn8OnIrujom0rpqbUsYfAozJttJUrI+gkjgPPsKVxGSwbK dOG74hjBjlahv1C3qnGNTjdxFa0S5mnH+i/Qx6HUMqlRmlIsNjHoHIU6SLoLiECo8Pd1 t7soeNwzi+SJl+VCsa7sgU9UHPYOf1udgnajdA8RXp+FaO3vto7fBaQ3l/nW7q5aFgMC Afc9GlH4swNa4XlvP52opmBSmUiFGNculsatIcg7Dp0/VcUOX04s+61BDSz9BxgELGCa 3R1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eCS0EqFg; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=wybfxsz9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m23-20020a637d57000000b0053ef4189de6si8529274pgn.372.2023.06.13.04.23.24; Tue, 13 Jun 2023 04:23:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eCS0EqFg; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=wybfxsz9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236464AbjFMLVW (ORCPT + 99 others); Tue, 13 Jun 2023 07:21:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239958AbjFMLJ7 (ORCPT ); Tue, 13 Jun 2023 07:09:59 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D43E10D8; Tue, 13 Jun 2023 04:09:58 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D24C9223E4; Tue, 13 Jun 2023 11:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654596; h=from:from:reply-to: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=+MI7Ni+qjWp8SvGCdzhLbAUt0sOV82JpEEinTZWk2UY=; b=eCS0EqFgmVYxAU15AWAIaTjBSPXAKzgM4/BSXkBrpOQ45EsJ+AsASxrwwKaiLwjM01DvGV xeRBSH1eI2hFJ5A7Q7BCzv3+IFdn5iEH27pITakS1rAthy2/Sb2k5s5tJtQP79IR+cHKBk dWAmGkJjjxC8SG41QQH0ofmEFKtLGho= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654596; h=from:from:reply-to: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=+MI7Ni+qjWp8SvGCdzhLbAUt0sOV82JpEEinTZWk2UY=; b=wybfxsz92wSMNNEGiUI9PWBGzPRVQxSkRhaqxQFXw//PwV7GKHcW5LWLyV5PBmLVvLMgRX sbT5sJRGw1qMrnCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8400013483; Tue, 13 Jun 2023 11:09:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QEUQH4ROiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:56 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 02/38] backlight/bd6107: Rename struct bd6107_platform_data.fbdev to 'dev' Date: Tue, 13 Jun 2023 13:06:37 +0200 Message-ID: <20230613110953.24176-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586390480432798?= X-GMAIL-MSGID: =?utf-8?q?1768586390480432798?= Rename struct bd6107_platform_data.fbdev to 'dev', as it stores a pointer to the Linux platform device; not the fbdev device. Makes the code easier to understand. Signed-off-by: Thomas Zimmermann Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg Reviewed-by: Daniel Thompson --- drivers/video/backlight/bd6107.c | 2 +- include/linux/platform_data/bd6107.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/backlight/bd6107.c b/drivers/video/backlight/bd6107.c index e3410444ea235..fa3dd45c8f9d1 100644 --- a/drivers/video/backlight/bd6107.c +++ b/drivers/video/backlight/bd6107.c @@ -104,7 +104,7 @@ static int bd6107_backlight_check_fb(struct backlight_device *backlight, { struct bd6107 *bd = bl_get_data(backlight); - return bd->pdata->fbdev == NULL || bd->pdata->fbdev == info->device; + return !bd->pdata->dev || bd->pdata->dev == info->device; } static const struct backlight_ops bd6107_backlight_ops = { diff --git a/include/linux/platform_data/bd6107.h b/include/linux/platform_data/bd6107.h index 54a06a4d26186..596ca4f95cfa4 100644 --- a/include/linux/platform_data/bd6107.h +++ b/include/linux/platform_data/bd6107.h @@ -8,7 +8,7 @@ struct device; struct bd6107_platform_data { - struct device *fbdev; + struct device *dev; unsigned int def_value; }; From patchwork Tue Jun 13 11:06:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp469226vqr; Tue, 13 Jun 2023 04:27:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7sYzOg0dkIGkwC/J944WvFU4fohO+/8pJM9VBJcpZFN8/ePIGOUht1sM7L2Z0KXEiCt9eb X-Received: by 2002:a92:dac5:0:b0:33e:4d5c:77f4 with SMTP id o5-20020a92dac5000000b0033e4d5c77f4mr9346130ilq.18.1686655638975; Tue, 13 Jun 2023 04:27:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655638; cv=none; d=google.com; s=arc-20160816; b=wEaiRKTW/tAmUqRyTg9CU2bnKaulSNpWu7cWFkpnbs7jwwPAOQu9/pU/gJYnvgBHGg OVY+25zO06ZfQgnG234UZnqFRYA6JTXwMqe/wueLjMRj+usnh5t28B0u9VfuisdM/0zQ oAwcCSFGkzRoH8v+2ua2yWC68VhYqUP4imTjosn9xtG0pF+Zda/NsaB7E5kyCZ3izYz1 LI7JhfA36DvehQaG6VKJQJyFFPQNQ9sG0cUuzgYeWnDEbhM9Bu9P4UVVtXszYkvtRZCO B13OAbets/J3dnDjvJGZ+pzB/r8gNqWE1QlDPXakVypFExOga98h7C9YhRGZlJ3S2Xy/ 88Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=8F8zYOtuNhkeGEJGjTGNJf7JW+gWS4lDFOo66WeTx0E=; b=s/2aC7d/dQ+CabWRInFVuU57MoyiirKOmZYWXp/k+pj3zbfe3PdtDxKOkIkc1+9DSc HPtvXCmgnQGoCuGM1S/KFZWFGUetVZHXWWFRy9rzjDFSrzsxh/kT38GOVW3FWNg9oLbc +gCJFULAtAjzlyQi9sfL94ZSpcsqDPX1Cj1dowySIXS/MMSgX0Mf7/Vl2r7lNojWUKa2 jtCMbDS5TOxy/QzoQrqzt/TGks+YQTFVknqbfyUnI3bC+qmrWhHRw9hM/J29e+BOeEN4 5D0omVeTfOxxFZa27LtyJGuZO0yYtdSC9cEgp2RZvwbQiphwRHohyHQOP9tbaGCs2HCU /lBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ECgCmMIN; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v5-20020a637a05000000b0050309caf60esi8479606pgc.750.2023.06.13.04.27.06; Tue, 13 Jun 2023 04:27:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ECgCmMIN; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241362AbjFMLVi (ORCPT + 99 others); Tue, 13 Jun 2023 07:21:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239624AbjFMLJ7 (ORCPT ); Tue, 13 Jun 2023 07:09:59 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C468710DA; Tue, 13 Jun 2023 04:09:58 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 44F201FD91; Tue, 13 Jun 2023 11:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654597; h=from:from:reply-to: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=8F8zYOtuNhkeGEJGjTGNJf7JW+gWS4lDFOo66WeTx0E=; b=ECgCmMINGISn/lWQG1aZEQVqxvjvla/Qc2oAMkkd0gA6ktxAzxHJeQc5qj/CU/QJw+tNYg v407xsy2u8ittm9pMqsBSjPx1uE9z0jZGoGH1kC98865iPYqV8F21E6VMgnpZPBhumW3zd pDdk+h/GcnMijj7JSvtK12cleuuph1I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654597; h=from:from:reply-to: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=8F8zYOtuNhkeGEJGjTGNJf7JW+gWS4lDFOo66WeTx0E=; b=7nTrivDvMYM/AT6jFbdL/EDQgl+DHpD7Miu3nB5yKE4CbLdpSmyIgMuOeJk5k6CgLXIYn6 uLQpwU7uc1YMxBCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D638A13A47; Tue, 13 Jun 2023 11:09:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UOVpM4ROiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:56 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Laurent Pinchart , Rich Felker , John Paul Adrian Glaubitz , stable@vger.kernel.org Subject: [PATCH v3 03/38] backlight/gpio_backlight: Compare against struct fb_info.device Date: Tue, 13 Jun 2023 13:06:38 +0200 Message-ID: <20230613110953.24176-4-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586623083667446?= X-GMAIL-MSGID: =?utf-8?q?1768586623083667446?= Struct gpio_backlight_platform_data refers to a platform device within the Linux device hierarchy. The test in gpio_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device. Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional. v2: * move renames into separate patch (Javier, Sam, Michael) Signed-off-by: Thomas Zimmermann Fixes: 8b770e3c9824 ("backlight: Add GPIO-based backlight driver") Cc: Laurent Pinchart Cc: Rich Felker Cc: John Paul Adrian Glaubitz Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: linux-sh@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: # v3.12+ Reviewed-by: Sam Ravnborg Reviewed-by: Daniel Thompson --- drivers/video/backlight/gpio_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c index 6f78d928f054a..5c5c99f7979e3 100644 --- a/drivers/video/backlight/gpio_backlight.c +++ b/drivers/video/backlight/gpio_backlight.c @@ -35,7 +35,7 @@ static int gpio_backlight_check_fb(struct backlight_device *bl, { struct gpio_backlight *gbl = bl_get_data(bl); - return gbl->fbdev == NULL || gbl->fbdev == info->dev; + return gbl->fbdev == NULL || gbl->fbdev == info->device; } static const struct backlight_ops gpio_backlight_ops = { From patchwork Tue Jun 13 11:06:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp469048vqr; Tue, 13 Jun 2023 04:26:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZVei/ImkondQM96PBvAMmLVZVlyj2yt42QAMitqWmf6rRyjwmSorXEsvvSc28GvTxWLaB X-Received: by 2002:a05:6a00:1744:b0:65e:691a:460f with SMTP id j4-20020a056a00174400b0065e691a460fmr15018268pfc.8.1686655617743; Tue, 13 Jun 2023 04:26:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655617; cv=none; d=google.com; s=arc-20160816; b=fu+nDuo+G7BXVz9itfaf2/vHapNcq9q//woO4CL0bQOCWlc17qTjUHkw0EO6XVqnRO iH3ls35lU7RXs3FPolCz8+JYRyqgkaL4pPIQPANZBioGR4maHwAycMvwVBTAZjKhL39H ieFLvpnLcrRIa29exxTbptZ9cgj7YlncQVlPkaVVuSuDYbvEcQinBH2iYxW/QChMsV0i EDjRN1QYo7DfFp0bpnAA60HwD/qpJ491j+B2Mm86bmgVewQqlPkdT666egK9EfWS0LvY verC1GB5xTh9R5loE9FlLCPGUy8KdAFCmWqNLRHqiH8zxUYyREXQjSGSnml8ynA75Clo 0WKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=759wPSS2YZhgjZvqqs3DuVdRpXqcbQxPoHRkgNwrzjQ=; b=WMGuF0XXL64PTD7EK05Xa8jNaa/8M8Xq2Ib6U6yV3IIAqdMXGlpHhsdYD3mV78KLtB QvNxMcdcJIoweTppWrZMzCib4X4IItJYlHrltL8HWukRUqDNDbqH7wOUlFTl+LJVH65O loaqyK9SI7IeU7PEDdf/SqGoafPTcqZERx8SyqwXb5HYVWWsZAfceXMaqzTOydB5vPM8 YxQsZMjKZhR/gcJZLIoy0ZVf61HuwrA+yAOt3U228BAbgZLlufi9NBlXipN92xNm6tzG kw7L9vtnfOPxpZhM5SvPvd+utlAaiVdYe6T2H5JV8gCxSsm7xX+vq8EKAlONCirFOi57 EMTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hB2LOkFd; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=IEJlUU0Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c5-20020a6566c5000000b0052cb473f95esi8438092pgw.214.2023.06.13.04.26.45; Tue, 13 Jun 2023 04:26:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hB2LOkFd; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=IEJlUU0Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240096AbjFMLVe (ORCPT + 99 others); Tue, 13 Jun 2023 07:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239966AbjFMLJ7 (ORCPT ); Tue, 13 Jun 2023 07:09:59 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E57AF10DE; Tue, 13 Jun 2023 04:09:58 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A2A2E223E7; Tue, 13 Jun 2023 11:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654597; h=from:from:reply-to: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=759wPSS2YZhgjZvqqs3DuVdRpXqcbQxPoHRkgNwrzjQ=; b=hB2LOkFdJ+zgRNkt1Xil1QsWxaSSGjhWIEkLnnB+ViefVknwgzP+1uVoJXm5oVEYtOKwaK iYZSd1mpgCuQz+47nSm+EndIsjAN/yhXD8m4zlUlNJ7H5V7IDE+3/2gq0puNLgJNUc0cjd cNZltbFm3n6FwjCID/HOxOq/GANXEjI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654597; h=from:from:reply-to: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=759wPSS2YZhgjZvqqs3DuVdRpXqcbQxPoHRkgNwrzjQ=; b=IEJlUU0QgQc1tc+jsRfLDZZsU94E6dRYpY9GsfopDnR7T62da6D3m9rgkIJCnVqZsF/Poi VUtvvBgd/IgiQsDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 490D313483; Tue, 13 Jun 2023 11:09:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QJ7tEIVOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:57 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Rich Felker , John Paul Adrian Glaubitz Subject: [PATCH v3 04/38] backlight/gpio_backlight: Rename field 'fbdev' to 'dev' Date: Tue, 13 Jun 2023 13:06:39 +0200 Message-ID: <20230613110953.24176-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586600856732589?= X-GMAIL-MSGID: =?utf-8?q?1768586600856732589?= Rename the field 'fbdev' in struct gpio_backlight_platform_data and struct gpio_backlight to 'dev', as they store pointers to the Linux platform device; not the fbdev device. Makes the code easier to understand. Signed-off-by: Thomas Zimmermann Cc: Rich Felker Cc: John Paul Adrian Glaubitz Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: linux-sh@vger.kernel.org Reviewed-by: Sam Ravnborg Reviewed-by: Daniel Thompson --- arch/sh/boards/mach-ecovec24/setup.c | 2 +- drivers/video/backlight/gpio_backlight.c | 6 +++--- include/linux/platform_data/gpio_backlight.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 674da7ebd8b7f..310513646c9b3 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -386,7 +386,7 @@ static struct property_entry gpio_backlight_props[] = { }; static struct gpio_backlight_platform_data gpio_backlight_data = { - .fbdev = &lcdc_device.dev, + .dev = &lcdc_device.dev, }; static const struct platform_device_info gpio_backlight_device_info = { diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c index 5c5c99f7979e3..d3bea42407f15 100644 --- a/drivers/video/backlight/gpio_backlight.c +++ b/drivers/video/backlight/gpio_backlight.c @@ -17,7 +17,7 @@ #include struct gpio_backlight { - struct device *fbdev; + struct device *dev; struct gpio_desc *gpiod; }; @@ -35,7 +35,7 @@ static int gpio_backlight_check_fb(struct backlight_device *bl, { struct gpio_backlight *gbl = bl_get_data(bl); - return gbl->fbdev == NULL || gbl->fbdev == info->device; + return !gbl->dev || gbl->dev == info->device; } static const struct backlight_ops gpio_backlight_ops = { @@ -59,7 +59,7 @@ static int gpio_backlight_probe(struct platform_device *pdev) return -ENOMEM; if (pdata) - gbl->fbdev = pdata->fbdev; + gbl->dev = pdata->dev; def_value = device_property_read_bool(dev, "default-on"); diff --git a/include/linux/platform_data/gpio_backlight.h b/include/linux/platform_data/gpio_backlight.h index 1a8b5b1946fe4..323fbf5f76139 100644 --- a/include/linux/platform_data/gpio_backlight.h +++ b/include/linux/platform_data/gpio_backlight.h @@ -8,7 +8,7 @@ struct device; struct gpio_backlight_platform_data { - struct device *fbdev; + struct device *dev; }; #endif From patchwork Tue Jun 13 11:06:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp467226vqr; Tue, 13 Jun 2023 04:23:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ77X2yOsbmF2ohqyGvI64fijEkx+N0DwLk+f9r2iG7k7+Br9DUjYCl29zKhr1L55+kD3/+D X-Received: by 2002:a17:902:f7c6:b0:1ac:6ef0:a96e with SMTP id h6-20020a170902f7c600b001ac6ef0a96emr8077014plw.31.1686655399037; Tue, 13 Jun 2023 04:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655399; cv=none; d=google.com; s=arc-20160816; b=A0J0z0gbcuA51JKvADmtw2q2v595ExGuFa6N9nmRLfDia0najOEFtjtX9yAhf9WjTs 5FBWuJEfvD4kyJ8XoXEZMWOYS9YSt/PJv5VPqnh1rd5RLYVI/diZ2FEXG4NcnThR0yCr K++Z0Ze33JIM8LAmOCGD61KeHcZBUcne/XgWPE7xB25UaSL86I//CAgzUJuKaIkHiLVi FclSfJyYLxbS7IMZDK+dyOIZVc4ddAUmfQ0/Vt31K7LB2dLc0PfBfYsjWYInx5OnuM4I xKjVVqWz2K8qp1APJJzyYI9mumw6UDa3IdB7c1HuBXtXcHqM3JDqOaVk0FL9SKU0bZfd 9iLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=WsDEEspPWul74UZLXdW4Ecwc8Oa61gwjOHH6cUKWaqk=; b=zkxD86f/6cxJR+9CJf9/XkdYsFQSJptuKRvBVrA1oR2Hm8wEB/LZ16l+0qumqLBwM/ dqc29L0jQWOmcoMqbwVBotmbw9pFPxU4aX/GvFaCzA+czA5xJVbHzuskFeOwGSxYrrZS 2d0IGhTp5Z5QKa8H99tfxCIaMFoDcl+PNIfRhI5HMSVda9tfYW3SEtVj8YV+2pS8xtMc IfFdZpf0FsmQ0e++rhK7GCEvcDCDVMVCBoopr53DlWqodo4Qsecs4gMC/iSK/Fbq3VVs nIwm0z3T+xIHPKr6sEAnF7h3LyY2vXvQFZ8ul3sS1c3ST+rvpHw10xkCd30/flxc2U0N RQfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KHWdLqkr; dkim=neutral (no key) header.i=@suse.de header.b=1p44QGyb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y15-20020a17090322cf00b001a99b9d767csi8653413plg.166.2023.06.13.04.23.03; Tue, 13 Jun 2023 04:23:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KHWdLqkr; dkim=neutral (no key) header.i=@suse.de header.b=1p44QGyb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239574AbjFMLVl (ORCPT + 99 others); Tue, 13 Jun 2023 07:21:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240019AbjFMLKA (ORCPT ); Tue, 13 Jun 2023 07:10:00 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CD9892; Tue, 13 Jun 2023 04:09:59 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1DB7E1FD92; Tue, 13 Jun 2023 11:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654598; h=from:from:reply-to: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=WsDEEspPWul74UZLXdW4Ecwc8Oa61gwjOHH6cUKWaqk=; b=KHWdLqkrddz7uVBb+Yv2fY2eeaje+oPTUxlMVi45GkBNEFZRssE8WRvLHIyXzyPvvxTBGW nD2v2MncxM+de/iQ2RpaGKY6Dpy/cRzLpisJR2pYyLjOU2mxw6oMsoLmVKYSLk2vcqmA9g Qkg6Da7q7sK1BJ/S3JW+9YyLm3elEx4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654598; h=from:from:reply-to: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=WsDEEspPWul74UZLXdW4Ecwc8Oa61gwjOHH6cUKWaqk=; b=1p44QGybnwv43z9lUWFXzQUhcsUiV9Pb7+AYixEqsnWUfaiwjJ020l547sviQBvkhxT8m4 FWcqeQMWDsQ0mBAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A846A13A47; Tue, 13 Jun 2023 11:09:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id iLoDKIVOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:57 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Laurent Pinchart , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , stable@vger.kernel.org Subject: [PATCH v3 05/38] backlight/lv5207lp: Compare against struct fb_info.device Date: Tue, 13 Jun 2023 13:06:40 +0200 Message-ID: <20230613110953.24176-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586371692828132?= X-GMAIL-MSGID: =?utf-8?q?1768586371692828132?= Struct lv5207lp_platform_data refers to a platform device within the Linux device hierarchy. The test in lv5207lp_backlight_check_fb() compares it against the fbdev device in struct fb_info.dev, which is different. Fix the test by comparing to struct fb_info.device. Fixes a bug in the backlight driver and prepares fbdev for making struct fb_info.dev optional. v2: * move renames into separate patch (Javier, Sam, Michael) Fixes: 82e5c40d88f9 ("backlight: Add Sanyo LV5207LP backlight driver") Signed-off-by: Thomas Zimmermann Cc: Laurent Pinchart Cc: Yoshinori Sato Cc: Rich Felker Cc: John Paul Adrian Glaubitz Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: linux-sh@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: # v3.12+ Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg Reviewed-by: Daniel Thompson --- drivers/video/backlight/lv5207lp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/backlight/lv5207lp.c b/drivers/video/backlight/lv5207lp.c index 00673c8b66ac5..99ba4bc0a500d 100644 --- a/drivers/video/backlight/lv5207lp.c +++ b/drivers/video/backlight/lv5207lp.c @@ -67,7 +67,7 @@ static int lv5207lp_backlight_check_fb(struct backlight_device *backlight, { struct lv5207lp *lv = bl_get_data(backlight); - return lv->pdata->fbdev == NULL || lv->pdata->fbdev == info->dev; + return lv->pdata->fbdev == NULL || lv->pdata->fbdev == info->device; } static const struct backlight_ops lv5207lp_backlight_ops = { From patchwork Tue Jun 13 11:06:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461228vqr; Tue, 13 Jun 2023 04:12:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6GWdYqIS+ds70v22pgaktt447/1QMhOqE/D7CKZtDaHC/bvAohyCeRCT/VG3s7q0tAraQu X-Received: by 2002:a50:ed91:0:b0:514:9cb5:ee1e with SMTP id h17-20020a50ed91000000b005149cb5ee1emr6094345edr.6.1686654750156; Tue, 13 Jun 2023 04:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654750; cv=none; d=google.com; s=arc-20160816; b=CbQMjCr/Fq5Z9GR19QgUYyYSUkXKq2STS0m9n5YklmXO7BZz03Adr/m+FWpAR1ELnQ f4GtyxY8Y1TIMsTY/A3WzAVHvPn4hyqlB+n7Q9Mjdkiv5rCJr1v3W0TL6EhZi5ydX41C Oc9oUyQx6bRJjrF5J/4V3hCgBofuW1nanrFb6wXiHw+JnSOy6kzFbQuY8K/lBrmi8/fB 6luJs9YF+PtE9Mv9tQ8tXVghH/kyurkBkPPNRjwOnbJdp/6fmiv81Xm1nCkSdN18OuzF DlGbcfO2UgW2UrJMV7JxKxYO9i4/0GgAINwqJuD5Gb5Zkpy/0tpZMbMnwvKrhcePG/C3 ew7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=KrLiCPptg/CrbEdxRS4nqESWN3R2XNbgt49nlTQ1rAI=; b=dDmFHS6mw4YXp3MRwvJmDc89/iITSMnqV1/1SnJGxLjDFtmPamdbz7KG6F/0IJj34G s9ig75sR6h1bL8TRPQooUn+CLXQBjpSEmFYNjEqo0UgB3GixyluQcGU5hE3hkKRn3/QE X4vpY5xf/WA/V0WGJEFbDZ7+Ov2GUBVArD27GC0sFxtztfOBRJ5dpRuWD+77z/ZDo5A3 rw+RyVdypsCE7Q0bjqeqvqTcfYfNhySmeEyUdDSpEGAnka1IgnOjUsaWPLmLmT8jGBxr TyrqU9WjgMG74FVXYmgt8t6H1TUl3/m8xsp3mT+Vw5c/5T/MKQc23iVYZ6GWdUGGNXH+ zA5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=GtWgQUMQ; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u3-20020a1709063b8300b0096b5c43d44csi5534380ejf.833.2023.06.13.04.11.57; Tue, 13 Jun 2023 04:12:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=GtWgQUMQ; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242151AbjFMLKg (ORCPT + 99 others); Tue, 13 Jun 2023 07:10:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240041AbjFMLKB (ORCPT ); Tue, 13 Jun 2023 07:10:01 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F020BE52; Tue, 13 Jun 2023 04:09:59 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7D761223F0; Tue, 13 Jun 2023 11:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654598; h=from:from:reply-to: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=KrLiCPptg/CrbEdxRS4nqESWN3R2XNbgt49nlTQ1rAI=; b=GtWgQUMQuvT+GLA4Ey8TUV9PghMgSXEALHmo+M9zbwr6GBu1++03z+rM64A/shZi/+JihM Xnywz1JlcqPCkRo9doybsThJJT7EygFDMMoFpnvyzyOkmVNxOKFEP5Kj4MGYs34yDB8Wjy TxB0r5mw4ZHQfBDOJcjbvRK103MGQJo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654598; h=from:from:reply-to: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=KrLiCPptg/CrbEdxRS4nqESWN3R2XNbgt49nlTQ1rAI=; b=/e17zNgNljXV6lJyXfhxYAJ8MTLoKAhFe0DGCBW/4/6g1JDQxmYWiZiSELNEU+NXV1GUeE AWZPROuIZvkaprBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 2079813483; Tue, 13 Jun 2023 11:09:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 6GAFB4ZOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:58 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Subject: [PATCH v3 06/38] backlight/lv5207lp: Rename struct lv5207lp_platform_data.fbdev to 'dev' Date: Tue, 13 Jun 2023 13:06:41 +0200 Message-ID: <20230613110953.24176-7-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585691257877261?= X-GMAIL-MSGID: =?utf-8?q?1768585691257877261?= Rename struct lv5207lp_platform_data.fbdev to 'dev', as it stores a pointer to the Linux platform device; not the fbdev device. Makes the code easier to understand. Signed-off-by: Thomas Zimmermann Cc: Yoshinori Sato Cc: Rich Felker Cc: John Paul Adrian Glaubitz Cc: Lee Jones Cc: Daniel Thompson Cc: Jingoo Han Cc: linux-sh@vger.kernel.org Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg Reviewed-by: Daniel Thompson --- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- drivers/video/backlight/lv5207lp.c | 2 +- include/linux/platform_data/lv5207lp.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 20f4db778ed6a..a18e80394aedc 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c @@ -202,7 +202,7 @@ static struct platform_device kfr2r09_sh_lcdc_device = { }; static struct lv5207lp_platform_data kfr2r09_backlight_data = { - .fbdev = &kfr2r09_sh_lcdc_device.dev, + .dev = &kfr2r09_sh_lcdc_device.dev, .def_value = 13, .max_value = 13, }; diff --git a/drivers/video/backlight/lv5207lp.c b/drivers/video/backlight/lv5207lp.c index 99ba4bc0a500d..739f45cd2d381 100644 --- a/drivers/video/backlight/lv5207lp.c +++ b/drivers/video/backlight/lv5207lp.c @@ -67,7 +67,7 @@ static int lv5207lp_backlight_check_fb(struct backlight_device *backlight, { struct lv5207lp *lv = bl_get_data(backlight); - return lv->pdata->fbdev == NULL || lv->pdata->fbdev == info->device; + return !lv->pdata->dev || lv->pdata->dev == info->device; } static const struct backlight_ops lv5207lp_backlight_ops = { diff --git a/include/linux/platform_data/lv5207lp.h b/include/linux/platform_data/lv5207lp.h index c9da8d4027504..95d85c1394bca 100644 --- a/include/linux/platform_data/lv5207lp.h +++ b/include/linux/platform_data/lv5207lp.h @@ -8,7 +8,7 @@ struct device; struct lv5207lp_platform_data { - struct device *fbdev; + struct device *dev; unsigned int max_value; unsigned int def_value; }; From patchwork Tue Jun 13 11:06:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461158vqr; Tue, 13 Jun 2023 04:12:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ73rP4GpiPvWFIfT4Rq+Szs9YPPcF9nRODyNE988UqumS/IjKkC9VffMaFRIoPlt8HcwpjM X-Received: by 2002:a17:906:6a15:b0:973:e349:43c8 with SMTP id qw21-20020a1709066a1500b00973e34943c8mr12219008ejc.69.1686654740869; Tue, 13 Jun 2023 04:12:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654740; cv=none; d=google.com; s=arc-20160816; b=UxwGJkl8LtppPXS6tFmRV9l5aHMi0nwV2//5OI8JHUppvX27KPGHAcwDI2+sHR6n8t i9S+0sWZg3B9Sd3ubH6GMiciGvMDJWRtxVG0MWV+M6f0KjkDzq6KoYnDiqnE00R90jmZ A7mKMrYAay9+1pgNLIhqO30WW+78wtpeATatjniI29ePDZAnUK5t94AixVkytMsKxkAs euMYyPZE8Xusu6448gr2t5ki2WINCCW6Uw7jJLLeyb+b2E2RsUfZgp0Eu+P0tizZl5g0 5DSNtIwJAhGKTcqLac19Jx3no5jjDbEaT+TWnUgxGdoNBdSESoZeNQTXPtTiThtZ0ON+ Ddug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=3Hne6zfetbnsseXQc/de0eJDmmigZxWOHUk4CZKAIDY=; b=eSGFRsx5Sjmx1OHqAy7qgzvU479XppQ0eBKT9JoLmmq8PVgnPVmdFURMWenqUDSUqK Y8pqFmY5IZWPKnDd6DXg6OGnZ+22ExQljkm09N9p2LhCy6QE6sILdg55k4J9DKE6Pis6 ZqoB4h4T1mUm067dvc88ZvuljDxMA2AZ9LFh2O8hiuTGKxEyc27W2duNoj5j+2M8gnS7 Jg2Fq9Pb4HSCwguk1tP7qOxKXcl3AIj++Tozu3h6AEBy5UGEsO0fTmEPomL7vuZz5AYV x9tSryw5d/hzEayZ/LDeyUMHEJv2b5B9hulQByow3V4kVvc64lxJES6AT/0RPmTVIQec B9FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KL3N5e5i; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w13-20020a170906b18d00b0096b58e3f6ffsi6313934ejy.990.2023.06.13.04.11.50; Tue, 13 Jun 2023 04:12:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KL3N5e5i; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239418AbjFMLKa (ORCPT + 99 others); Tue, 13 Jun 2023 07:10:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240108AbjFMLKB (ORCPT ); Tue, 13 Jun 2023 07:10:01 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 489D510D8; Tue, 13 Jun 2023 04:10:00 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D3254223F6; Tue, 13 Jun 2023 11:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654598; h=from:from:reply-to: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=3Hne6zfetbnsseXQc/de0eJDmmigZxWOHUk4CZKAIDY=; b=KL3N5e5ivtUmwkAJemE63I+AtdC5MiHTK4dzeTOEeAKJfbjDZggCYd1n1knqsnsUGAOndJ A/7c86AcjfM3MVygCAn07cFPtEXjTfN+E6CjKMg6zXPLATQ4pyKPA0FX5ggtvfFIbobYxn G6Dp5t9Shvz7Asuokh1ps4REO/36AMY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654598; h=from:from:reply-to: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=3Hne6zfetbnsseXQc/de0eJDmmigZxWOHUk4CZKAIDY=; b=APplPEVT6MZ9PeXzJ8dv98VwUZ2pPhx1D0WWnZxRl+iwXoGHgfISZUbi9PsTM1tC17vGlu 4n+4eow1R5DAzyCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8174E13A47; Tue, 13 Jun 2023 11:09:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YD+hHoZOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:58 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 07/38] fbdev/atyfb: Reorder backlight and framebuffer init/cleanup Date: Tue, 13 Jun 2023 13:06:42 +0200 Message-ID: <20230613110953.24176-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585681641628783?= X-GMAIL-MSGID: =?utf-8?q?1768585681641628783?= The driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/aty/atyfb_base.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index cba2b113b28b0..51504fe39054c 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -2654,11 +2654,6 @@ static int aty_init(struct fb_info *info) USE_F32KHZ | TRISTATE_MEM_EN, par); } else #endif - if (M64_HAS(MOBIL_BUS) && backlight) { -#ifdef CONFIG_FB_ATY_BACKLIGHT - aty_bl_init(par); -#endif - } memset(&var, 0, sizeof(var)); #ifdef CONFIG_PPC @@ -2751,6 +2746,12 @@ static int aty_init(struct fb_info *info) goto aty_init_exit; } + if (M64_HAS(MOBIL_BUS) && backlight) { +#ifdef CONFIG_FB_ATY_BACKLIGHT + aty_bl_init(par); +#endif + } + fb_list = info; PRINTKI("fb%d: %s frame buffer device on %s\n", @@ -3716,12 +3717,13 @@ static void atyfb_remove(struct fb_info *info) aty_set_crtc(par, &par->saved_crtc); par->pll_ops->set_pll(info, &par->saved_pll); - unregister_framebuffer(info); - #ifdef CONFIG_FB_ATY_BACKLIGHT if (M64_HAS(MOBIL_BUS)) aty_bl_exit(info->bl_dev); #endif + + unregister_framebuffer(info); + arch_phys_wc_del(par->wc_cookie); #ifndef __sparc__ From patchwork Tue Jun 13 11:06:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461133vqr; Tue, 13 Jun 2023 04:12:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5257xQ8pg0f1FBfZ7O7gFyzTDY5XaYPIuij9ylETwvk5OCcEt23NQazG1kh4XwzFJjfhmD X-Received: by 2002:a17:907:969e:b0:968:892b:1902 with SMTP id hd30-20020a170907969e00b00968892b1902mr12273902ejc.6.1686654738212; Tue, 13 Jun 2023 04:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654738; cv=none; d=google.com; s=arc-20160816; b=DFKpcy+z1zXH6+NHR+8jy5fuBbXDJgA3nMYPb6kIrI7Drnzb4K8MG8iweKRYAYm4Gh pkCNr51hC1o8GnqkxQfllz9sIPZOQZ6nEx+CRYaYNnYmjDkrSpAihjhavAyfp1BH+Kg9 M0AA2YpNEzQsA/ejk/LiTRlz+DcQUYN90AnlCfGDOViKlTG1ge9bAto8Qw9nTdkuJHGL bB6mQRLVjqT4lxrYTxr+lRjwzeSQDcyb9hxqmBQtHhz6uauHPupEO/4waeaObBcDutL+ i/yG/cyJKTdjIkPrmjZ1kj2Bybfu0KhHI8E/95nOcPYzeYU/Zy2Il80wQS3ZFQTx6O8S brpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=N6UYzax8sy0i7WEMeFaDgyi8TXvZrP+1xJ7ZvWeiGdc=; b=VjtRb0yqBWMN7/b299cMadvouJwg/cM6wmqm/OPi1OAwW89iWROOumid1q+QfqB4mg izRGkahxG+ZLTssUbQXexLtDiFAx8DmpOCWMMOw+IpRjsPLBxWh1qJrXZlW33Hr4shVh w+80eVoDPpRJVqZPwpXdghsOZrNSF+1efjRpgkvY40O51R2YliMZ1V5cr2JHfz4FFtSl DGJksRZTJMSOCEFMGJQflfIWl0mYZsNoQ7MMoqVQrHJLS1acOWdbjOKNIXbD1033ysLv a1e4CGUTW9D3OQIy5B9ejOTFp8vhSgn3TnALdWGktkSG7i/Tm6y5PXg8i5Es4sqcjGG7 pnVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qtz2dSwP; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r18-20020a1709062cd200b009788e95e36dsi6636932ejr.723.2023.06.13.04.11.44; Tue, 13 Jun 2023 04:12:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qtz2dSwP; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242170AbjFMLKR (ORCPT + 99 others); Tue, 13 Jun 2023 07:10:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240194AbjFMLKB (ORCPT ); Tue, 13 Jun 2023 07:10:01 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F64610DA; Tue, 13 Jun 2023 04:10:00 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 244E522400; Tue, 13 Jun 2023 11:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654599; h=from:from:reply-to: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=N6UYzax8sy0i7WEMeFaDgyi8TXvZrP+1xJ7ZvWeiGdc=; b=qtz2dSwP5WJ5nsuM05H6W2WTXW0XAhOxB/6rivaTIV+vVU1nJib4WaikFGa+pQtHdDL4Uy rBvizmtOk++j73+ABdjldHh/clPoWseETINWt+jcQNHvSIPk2IT9ZnkD9d/sr4zQK/WETi HL4vNlGuSSJat5CGGi08A5aIBlyxYfQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654599; h=from:from:reply-to: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=N6UYzax8sy0i7WEMeFaDgyi8TXvZrP+1xJ7ZvWeiGdc=; b=iIQ4na6vF/ATUubYmNBaHn0nwKW8Y1Kw+l50sGNwnwBduKI74p4HPe3KqYeuUV6gG34bKT gdmIjWuJU0FGDUDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D633E13483; Tue, 13 Jun 2023 11:09:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sBB1M4ZOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:58 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 08/38] fbdev/atyfb: Use hardware device as backlight parent Date: Tue, 13 Jun 2023 13:06:43 +0200 Message-ID: <20230613110953.24176-9-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585678955557517?= X-GMAIL-MSGID: =?utf-8?q?1768585678955557517?= Use the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/aty/atyfb_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index 51504fe39054c..e1602e3fbc66b 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -2255,7 +2255,7 @@ static void aty_bl_init(struct atyfb_par *par) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = FB_BACKLIGHT_LEVELS - 1; - bd = backlight_device_register(name, info->dev, par, &aty_bl_data, + bd = backlight_device_register(name, info->device, par, &aty_bl_data, &props); if (IS_ERR(bd)) { info->bl_dev = NULL; From patchwork Tue Jun 13 11:06:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461500vqr; Tue, 13 Jun 2023 04:13:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64ACCVSGBcku9glJGVcLUJNfXGH+Fbzh4aLpdLyJ95rGSkTRd1RlLdLyfQPqpzkUgMaZFh X-Received: by 2002:a17:906:4786:b0:94f:694e:b953 with SMTP id cw6-20020a170906478600b0094f694eb953mr11271826ejc.59.1686654782936; Tue, 13 Jun 2023 04:13:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654782; cv=none; d=google.com; s=arc-20160816; b=qOed9fLISbT9BaVQEemnBLhbZRgIyJb42k4GZmLIsXbM04L+viz11Hw1jOjVyrUyNf lU7VM5+wU2GnrIEIjuvtT7cLIzhRxMS95eG9ubAuZMua2nlRSKrCjyahrlPFVeXL/muJ yqlEocJisWTIGkmCy31IYBho2T2ffZQtycjZAlrFRNJI+dd5QPiiD8s47QcZfbayPlbC BzVc1SL8X4NMjVWxgD8h34ATO8qW2mh1+7jWVh9ruuqdNdS4EI6T/37LqjaGM+rn5wgS 0Q5INIIKlJLMU/oAcTB23ncyVYkjB4mwiPXUK4rkwZniAz13F00iWuMhuBB8MB6vtuNi ujsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=2wf5UN+K9UcAVy1mCANrZvQ9x0IpdyWlrVw1Wkiccp8=; b=eQN33DgS67IILQ48EK8gjKEbbiCNSAU14o2ONdemEXEHYq1xQavpN+KfEje1doLFRi 0qAzIZJgSX9ghHkS9paq2EGwtTZxFgFyKCHzj2RGPgPPOh+9OYPn3CEaUdCveHgqqgz2 xOOc7uHCtjBpl99t0OHWezbFaARop5VXKAFcB7bUAx48A+zFRkKWMsaYMrSs1YvZxsLm k11rKr6D2eg/pssGuLy5hhvxAhiZdJLi4kZGQ9xg+iHqd4hYhzFhscrJHCC7V+zAScdQ 3qDOsn9Wpmeti1+JNexlvB+rEafvduwllhfI03zPfK6GCiV7onKXkLBOE3Lz5dQGTZpe /5CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="Nu/aaOrs"; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m15-20020a1709060d8f00b009764eccdf24si6583680eji.878.2023.06.13.04.12.15; Tue, 13 Jun 2023 04:13:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="Nu/aaOrs"; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240096AbjFMLKv (ORCPT + 99 others); Tue, 13 Jun 2023 07:10:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239833AbjFMLKB (ORCPT ); Tue, 13 Jun 2023 07:10:01 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B970510DE; Tue, 13 Jun 2023 04:10:00 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 695741FD94; Tue, 13 Jun 2023 11:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654599; h=from:from:reply-to: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=2wf5UN+K9UcAVy1mCANrZvQ9x0IpdyWlrVw1Wkiccp8=; b=Nu/aaOrslrM66/21iVrUsUCTXmyWGejYdEvhVWbTTvejZLW0RsRzMAtIu6mGfqNZcsAXGI iAiAj7DCMQrNNHZuzZgD/XlwL1HuyoBnngarP8OoEqOIy64fGBuTm90nmmf7NOqyl/1Res MYcgZO01fxU02q7NWciFY3UvE/GGZxI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654599; h=from:from:reply-to: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=2wf5UN+K9UcAVy1mCANrZvQ9x0IpdyWlrVw1Wkiccp8=; b=Awwnl0APnI49QzRWeWfRYyXqXzgxWh+3sTo9xLumKCBpYeAMn/D3FEgF3jDsENtzq83I7o +poLwx6OQms4x9DQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 26C7013A47; Tue, 13 Jun 2023 11:09:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mGrCCIdOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:59 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 09/38] fbdev/aty128fb: Reorder backlight and framebuffer init/cleanup Date: Tue, 13 Jun 2023 13:06:44 +0200 Message-ID: <20230613110953.24176-10-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585725328019192?= X-GMAIL-MSGID: =?utf-8?q?1768585725328019192?= The driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/aty/aty128fb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c index 36a9ac05a340f..b4a49068a522f 100644 --- a/drivers/video/fbdev/aty/aty128fb.c +++ b/drivers/video/fbdev/aty/aty128fb.c @@ -2028,14 +2028,14 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent) par->asleep = 0; par->lock_blank = 0; + if (register_framebuffer(info) < 0) + return 0; + #ifdef CONFIG_FB_ATY128_BACKLIGHT if (backlight) aty128_bl_init(par); #endif - if (register_framebuffer(info) < 0) - return 0; - fb_info(info, "%s frame buffer device on %s\n", info->fix.id, video_card); @@ -2167,12 +2167,12 @@ static void aty128_remove(struct pci_dev *pdev) par = info->par; - unregister_framebuffer(info); - #ifdef CONFIG_FB_ATY128_BACKLIGHT aty128_bl_exit(info->bl_dev); #endif + unregister_framebuffer(info); + arch_phys_wc_del(par->wc_cookie); iounmap(par->regbase); iounmap(info->screen_base); From patchwork Tue Jun 13 11:06:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466761vqr; Tue, 13 Jun 2023 04:22:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4+D3GGDkoH+/ezUEhGrGzJ/yhI5W9fCKJPT124lfOqiqjjIFh/PB2Ofd+vsPLUPUaZqFst X-Received: by 2002:a05:6870:d412:b0:19f:3db1:e2cd with SMTP id i18-20020a056870d41200b0019f3db1e2cdmr7631522oag.49.1686655348582; Tue, 13 Jun 2023 04:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655348; cv=none; d=google.com; s=arc-20160816; b=S0zLQHk9JhBkV+Qu1P2YSzNnMexGVzjRhcLd6w77Dm/akphO2hzwNiwEG1Kn/R07s0 eMqhCZMOV793OlcFVzzkLidsyGDG+IMORBl4XjWwQpCd7VmUCqzZSfSKvrlXwtqyL1gC FhemIZr4NFQAIVHriUkmxfxKhhgfY5gjmSVFhLuFnicZ7PsCIGXsJhJvpoSC5fp4Ld7s axfJlrMmoXIJd05pGETXDFtC6pGukuXfYhcl/nSj89XAqwkqzAvJL+tB7hOgRSC18Q0W bP+xvF3CRz3+TEqEY02yUxPAbVU7VGY4lRv8K/vPKLyZRVazQEiaI3dBOJvjS/rmNXzD svVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=n1RUmBKa1b/V45kq7Fq+nxhRPDt5rsHzvLZj5NnjnsE=; b=oKp8yzqlekFuz3y1Ksefy17xXTcISVInj5Gb6V6dbvKq8NRkl9bLb3y/lJOqSgLaW+ 7KDvFRLHzyyjeQapFvIaIgUUN4H0DwCTLbAMgm/mSxiPOoIqL/JNS2RPZV6jSHLvOlim GzFDDHOPsOsVsgOg8punjX8TVISkjKrRby0dr8KT8XmcrskOhLyTy9sqfgohbkbKkYc5 nZT6JueX+SzHot3czLUh1bmvu1kS2bR23NGd+izUEulICHE3971IR5qpA5a/y8HAE6U9 WBQO8064UraeHBIn4cbY+mtnFk/PQMwh5KBbMafX4yOlgkcnsN5L3kKkH6NDqrzAu5e3 lSdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eHROwS8u; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s6-20020a625e06000000b006626454ef63si8475382pfb.364.2023.06.13.04.22.16; Tue, 13 Jun 2023 04:22:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eHROwS8u; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239456AbjFMLKr (ORCPT + 99 others); Tue, 13 Jun 2023 07:10:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240211AbjFMLKC (ORCPT ); Tue, 13 Jun 2023 07:10:02 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CFD492; Tue, 13 Jun 2023 04:10:01 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B07221FD96; Tue, 13 Jun 2023 11:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654599; h=from:from:reply-to: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=n1RUmBKa1b/V45kq7Fq+nxhRPDt5rsHzvLZj5NnjnsE=; b=eHROwS8uJRUKzXKFeBny+W6yHIMBQnstPxq6Axk3N6CWnIVuGOPL1ftbu8pN+RsX8qIFQX 5LqZP8whXMiE/My8weF8DnXKwJhN+wFg21r/H6jd40HjZukBOtnl1aH2NO8XdEGO0jB1hq JcZ5jdIVNO0jbAkletoTLgVj06/bgkI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654599; h=from:from:reply-to: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=n1RUmBKa1b/V45kq7Fq+nxhRPDt5rsHzvLZj5NnjnsE=; b=xy+vYMkCnw1cl7sdD31+jeSmcTu2XBj/IwCfOKfmdRWnXBgD4T4QJZqvABxFCpTokXdpsq LApcKPYNgCBu99Aw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6CA4813483; Tue, 13 Jun 2023 11:09:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OBy/GYdOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:59 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 10/38] fbdev/aty128fb: Use hardware device as backlight parent Date: Tue, 13 Jun 2023 13:06:45 +0200 Message-ID: <20230613110953.24176-11-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586318489592293?= X-GMAIL-MSGID: =?utf-8?q?1768586318489592293?= Use the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/aty/aty128fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c index b4a49068a522f..2d9320a52e519 100644 --- a/drivers/video/fbdev/aty/aty128fb.c +++ b/drivers/video/fbdev/aty/aty128fb.c @@ -1846,7 +1846,7 @@ static void aty128_bl_init(struct aty128fb_par *par) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = FB_BACKLIGHT_LEVELS - 1; - bd = backlight_device_register(name, info->dev, par, &aty128_bl_data, + bd = backlight_device_register(name, info->device, par, &aty128_bl_data, &props); if (IS_ERR(bd)) { info->bl_dev = NULL; From patchwork Tue Jun 13 11:06:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461262vqr; Tue, 13 Jun 2023 04:12:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6q0WjcIS+Q+nR5/oZUeQjZnbH2WCMzZgtYELDllRETW78LsYHHQNwqBeQOqmLzSajgai/k X-Received: by 2002:a17:907:9622:b0:97c:46c7:d5eb with SMTP id gb34-20020a170907962200b0097c46c7d5ebmr12574628ejc.10.1686654753361; Tue, 13 Jun 2023 04:12:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654753; cv=none; d=google.com; s=arc-20160816; b=kLZlyYPw9gxSSzncpWf7v8yxXzllZX5npXR9G6NUbSp1lT4IT7HtMT/hUZ7pIfqeOE 81smUJTx9SCu4MJysSR+m6Gcyol9fooJdWolMQz+O3vShZDssdbOWJDafNPTAe9YGS3P uJjovix4N0nwh46Y9dr+hTKbXnUp+S+tY6cdOcGAZk/u3aJJS3SVfsoz6sbM6EX1xpLu vkRziFyjBGdp4mlWlMP+JBEGEKdwzRquxwIeUGNmL6wnzleHji8aXsFTmHqePNcq0Xu3 RfsjjppP0coLyKpzkw7jI6d95xX7CtJhK94FJo17hZ+ZyYT8dhfIRTEimCxRQ0/S3IkM uxaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ZPPYcjWN8J9RRN2Nr3wZGe38UVjFcB1o2ohetIOz8WY=; b=BtjQdmGHBH6JJ5M8Fydb3KZAThGKsqArcjvrBXjlGQt9qryRJjvTujiAq0NCJhs/bX sq3AoUH09ETuN4ftdFv/4H64AJ4zH+2UOSLEmJm+IXomAbbO9TCox/75SvtUjczBu8f0 FlAUWQxVyqcPTIDEHvnScOMX979ZtBJZqcIdYmVyu0oKd9+dteUIQQYIY/LGzdme1Rd6 eT80cTM7xIlU+jVRaM6/mDh6DVIh4bQ65dvcQkSiXKHuxBDu5MmOg75V9dJWTKEHxnlt Ejh32C22m4kd38nBurRel01uSsXsrOhi8yaBijvhcIz4DR1ukIDcq3XvEWyoxigPLgmj AaCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hY6iINut; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="44G/xpPC"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kl17-20020a170907995100b009780cfaae1bsi6718606ejc.32.2023.06.13.04.12.02; Tue, 13 Jun 2023 04:12:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hY6iINut; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="44G/xpPC"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242157AbjFMLKm (ORCPT + 99 others); Tue, 13 Jun 2023 07:10:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241122AbjFMLKC (ORCPT ); Tue, 13 Jun 2023 07:10:02 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61D4D10E2; Tue, 13 Jun 2023 04:10:01 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 02A1F1FD97; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654600; h=from:from:reply-to: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=ZPPYcjWN8J9RRN2Nr3wZGe38UVjFcB1o2ohetIOz8WY=; b=hY6iINutuSohne15vTK9bIeWFsgmigYskFrTjbAUq6VqfEJr6WcDqq2PLKvnGJ2MaPesrE L7d2rEnY2U/Qj/FDwzGuWiKEeL4bx8ZUy4JIu82djHgVbQerUvA/3TeYnfVuwl2d2FsKmt EKeQbx/OlsO85UUCk/w1+XyMs5B+vU0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654600; h=from:from:reply-to: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=ZPPYcjWN8J9RRN2Nr3wZGe38UVjFcB1o2ohetIOz8WY=; b=44G/xpPCUikoBP+2hqCK5gsZYHWGWjM85j4WI6ZGrkZcE/jqNSvL48VslAz3641z91/cwk 0PJT90IfdRiNXkAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B369E13A47; Tue, 13 Jun 2023 11:09:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yDcMK4dOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:09:59 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 11/38] fbdev/broadsheetfb: Call device_remove_file() with hardware device Date: Tue, 13 Jun 2023 13:06:46 +0200 Message-ID: <20230613110953.24176-12-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585695052283703?= X-GMAIL-MSGID: =?utf-8?q?1768585695052283703?= Call device_remove_file() with the same device that has been used for device_create_file(), which is the hardware device stored in struct fb_info.device. Prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/broadsheetfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c index 5f18af88e7408..5a5fe4bbc10b0 100644 --- a/drivers/video/fbdev/broadsheetfb.c +++ b/drivers/video/fbdev/broadsheetfb.c @@ -1200,7 +1200,7 @@ static void broadsheetfb_remove(struct platform_device *dev) if (info) { struct broadsheetfb_par *par = info->par; - device_remove_file(info->dev, &dev_attr_loadstore_waveform); + device_remove_file(info->device, &dev_attr_loadstore_waveform); unregister_framebuffer(info); fb_deferred_io_cleanup(info); par->board->cleanup(par); From patchwork Tue Jun 13 11:06:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461554vqr; Tue, 13 Jun 2023 04:13:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7G0OsXyI3/eWyBHEbeiCEKM3Kn6CE+lMSNJkee9PhrrMblIjzosYmbmAYccr8eyJwqiqrk X-Received: by 2002:a17:906:7953:b0:973:92a8:f611 with SMTP id l19-20020a170906795300b0097392a8f611mr12116750ejo.31.1686654788906; Tue, 13 Jun 2023 04:13:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654788; cv=none; d=google.com; s=arc-20160816; b=PfzkNudvERI1Bnuuu20S9vZGMMx+JHfNk53Pgf+OMCGTjpbdNd5ewI8qK/FEfDujR5 0/CM2nBtg9fWn9o6olXjj4XhP40lS4Rq/C09iFMWS2urdvvubHt9yOaO1liruoujVDn9 e4dQdWDS79P7FpHV7ljo2i3UDZ5CTY/Rh/ILapfgATcfGN5aqpvuOcDVXyU1xxckkU4+ vpaIASq05OeS6rnbFC33Yizlp8K1jeKaR6JHv5lSIPJfYcVVF1bo68mJ31CE8vK6CPlz wnMiEgUNDQk53mO6BJqlKl4XYXsqg0rnDqfeyT/9M3vVMB4c6Uw8q1gJ4xuXWgRlBRMO kXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=wgea4CAx5RQUmrYwJYNcyiyGnDDQ3dqg16YEIp4VW1k=; b=vPsOMjaD5uleu7jrKBWZZNZzb4UiXrU9dQ+7yy+n1umgIe63czL8G/6OmG8QRQQW6Z U16pfJiNAm+W/DSiUd8mKCQ4KPbdV1Ix7FJArueVc3q2Oij8wmmfpyDIhdsC1cKslb7T HyP9vWjENTZQTPm4v4Ft7jbz7vLl9j7hQ/wl4B+GX+/nGKk+4HJKW+cQ0wHyLf6c9mMU ybb2rYyO10gUANWmGf7exqTXITzW+6uu3TTPIlKD+Zbdp6GGilR0BTBnrMOh8I2Jf83t Dm4kzDqEZ2VokdWtc+90hRM+rXUFOXhEZssxG28Rhg7TlYCIrlVxSWUpVayT1EaYbL97 60sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KpOGwMTR; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=BH3aTWJc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f26-20020a056402151a00b0051493282fafsi7132080edw.690.2023.06.13.04.12.39; Tue, 13 Jun 2023 04:13:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KpOGwMTR; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=BH3aTWJc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242222AbjFMLLD (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241644AbjFMLKC (ORCPT ); Tue, 13 Jun 2023 07:10:02 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0A94E52; Tue, 13 Jun 2023 04:10:01 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 4B6681FD9A; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654600; h=from:from:reply-to: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=wgea4CAx5RQUmrYwJYNcyiyGnDDQ3dqg16YEIp4VW1k=; b=KpOGwMTRGofNmhOvJtJWHYoxw7MmbRGeo6FzxVMzqS8Cl/HkPaqlqAIbbj5QVOxQDh/1ef HmTOZZdLLfzm9zdlL6u/vxhlgRbWB0WsEox8pd5anT+ZsyfUUVWGtiHUZ7ZUy3ZgGKZhKE 8wfoh2o8hDRXm8FwGh53HXFXlR5ZspA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654600; h=from:from:reply-to: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=wgea4CAx5RQUmrYwJYNcyiyGnDDQ3dqg16YEIp4VW1k=; b=BH3aTWJc5uDayXV3wpXjuSh1Sh5kbMo7UKgjKKzOa4KrYc6ekCR5qDLHKStl5r3NnssLBl 0ZAPAlm7SNuT1iDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 064B813483; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KPbCAIhOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:00 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 12/38] fbdev/ep93xx-fb: Alloc DMA memory from hardware device Date: Tue, 13 Jun 2023 13:06:47 +0200 Message-ID: <20230613110953.24176-13-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585732032627489?= X-GMAIL-MSGID: =?utf-8?q?1768585732032627489?= Pass the hardware device to the DMA helpers dma_alloc_wc(), dma_mmap_wc() and dma_free_coherent(). The fbdev device that is currently being used is a software device and does not provide DMA memory. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas --- drivers/video/fbdev/ep93xx-fb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/ep93xx-fb.c b/drivers/video/fbdev/ep93xx-fb.c index 94fe52928be25..376ee59e925c2 100644 --- a/drivers/video/fbdev/ep93xx-fb.c +++ b/drivers/video/fbdev/ep93xx-fb.c @@ -312,7 +312,7 @@ static int ep93xxfb_mmap(struct fb_info *info, struct vm_area_struct *vma) unsigned int offset = vma->vm_pgoff << PAGE_SHIFT; if (offset < info->fix.smem_len) { - return dma_mmap_wc(info->dev, vma, info->screen_base, + return dma_mmap_wc(info->device, vma, info->screen_base, info->fix.smem_start, info->fix.smem_len); } @@ -423,7 +423,7 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info) /* Maximum 16bpp -> used memory is maximum x*y*2 bytes */ fb_size = EP93XXFB_MAX_XRES * EP93XXFB_MAX_YRES * 2; - virt_addr = dma_alloc_wc(info->dev, fb_size, &phys_addr, GFP_KERNEL); + virt_addr = dma_alloc_wc(info->device, fb_size, &phys_addr, GFP_KERNEL); if (!virt_addr) return -ENOMEM; @@ -440,7 +440,7 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info) "has bit 27 set: cannot init framebuffer\n", phys_addr); - dma_free_coherent(info->dev, fb_size, virt_addr, phys_addr); + dma_free_coherent(info->device, fb_size, virt_addr, phys_addr); return -ENOMEM; } @@ -454,7 +454,7 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info) static void ep93xxfb_dealloc_videomem(struct fb_info *info) { if (info->screen_base) - dma_free_coherent(info->dev, info->fix.smem_len, + dma_free_coherent(info->device, info->fix.smem_len, info->screen_base, info->fix.smem_start); } From patchwork Tue Jun 13 11:06:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466577vqr; Tue, 13 Jun 2023 04:22:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Hq2ZfbYa3DoEFLnk7NhcPAV4cuab6dqDtucgeAMZ/bD6Cg+o4oZixc4cJBNj5Jfxckcpk X-Received: by 2002:a17:90b:4001:b0:25b:cfd4:c1b3 with SMTP id ie1-20020a17090b400100b0025bcfd4c1b3mr5449123pjb.40.1686655324364; Tue, 13 Jun 2023 04:22:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655324; cv=none; d=google.com; s=arc-20160816; b=zs7jpa4vave+4G4sbjWUc/JJ8MqqP1W+QrKuq69BumMFsi/q01uior59gyqTr4uj3H +gh0/yh6d7twwapnpOVIjQE5zGAGo+oLJM/ASfoUF+skPkETVEmkkOEFqCfxul9bS5Oj xG8eDN6FRYhiqqbCKk4Hk+rojtgbkJ3X3j6+gehAqXn5qoEG68Cdhu6HvErrwQLjBOoV BIxXN0voo8AWez47BLcSJ+AVy/CXiuIPGEPGI5VyZ8CzSKSdAH+8mFxgvaaqdVW9obAQ D3OyGR8aimEtkV/maiNAWUzm30OY4mSijY12oksbtnlDl3vj29dUjb52CW7Pn+feWdgD owgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=h4S/NtdS9jYQgn3GSTSNl9GBoKRD7t52iOsQgfQx1Dg=; b=ISfpPdSAfP+OxvRe0/4YHU9wKqxDjS8uaMuWXi+PkCtet98E8lMGGSPbiTndPSiGk8 B5z0QEPP527n6x9rvQeLs9VA0NK68sTXFKanDS1lRGWl0/v5oacx/Mdtgu/3zrMPlRZY 8DIkAQSxA7AMN2qRP6ys5suHq93WHQi4VkjS/ZliFykeAN+xBnaKVkZAvI1bKmV6uwel VN2FcbMHupH6klSfh+nhoFwNEk0Tw5JvhX1IehdRmrAsp9Z44Y8KuSfRskb3IUSMizY4 Bx+U2ZdQWnzJ9rKx6XioKhCQA4XS6M1IZmli4GgPQ6ZFj4imiyCnUsaL4QBacvrGji36 +n6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=0faE41A+; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u63-20020a17090a51c500b002569b9b4397si10457601pjh.47.2023.06.13.04.21.51; Tue, 13 Jun 2023 04:22:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=0faE41A+; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239868AbjFMLLK (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242100AbjFMLKC (ORCPT ); Tue, 13 Jun 2023 07:10:02 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D87D910D8; Tue, 13 Jun 2023 04:10:01 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 9816E22406; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654600; h=from:from:reply-to: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=h4S/NtdS9jYQgn3GSTSNl9GBoKRD7t52iOsQgfQx1Dg=; b=0faE41A+q8yqg0nXYiO2SshzS3Z5NEnuANhHqV+PWRDkBPRKPTzE3bL81/quL6QhpkDPOF 8MoL5qHEh79maK3o8SgfvsuGg44xIgtpbH9u1GL4PPQgtxjpZNfhpoKjiFr6udy6ewjKc8 VYcAG+Wtu/qZaTL8OkMFXX3NcJZJnN8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654600; h=from:from:reply-to: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=h4S/NtdS9jYQgn3GSTSNl9GBoKRD7t52iOsQgfQx1Dg=; b=n5ZkqINcDWoQbdQ8OWcwVvetvTY5qp6xArCO8R7JVGmgWVsE8PwmQ9cRLjGYWbHLR0PmFu MyFg2bh0W+qCCpDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 4F91113A47; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id AJ5KEohOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:00 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 13/38] fbdev/ep93xx-fb: Output messages with fb_info() and fb_err() Date: Tue, 13 Jun 2023 13:06:48 +0200 Message-ID: <20230613110953.24176-14-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586293586555624?= X-GMAIL-MSGID: =?utf-8?q?1768586293586555624?= Fix cases were output helpers are called with struct fb_info.dev. Use fb_info() and fb_err() instead. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/ep93xx-fb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/ep93xx-fb.c b/drivers/video/fbdev/ep93xx-fb.c index 376ee59e925c2..f6cd200fe50ff 100644 --- a/drivers/video/fbdev/ep93xx-fb.c +++ b/drivers/video/fbdev/ep93xx-fb.c @@ -436,9 +436,9 @@ static int ep93xxfb_alloc_videomem(struct fb_info *info) * least. */ if (check_screenpage_bug && phys_addr & (1 << 27)) { - dev_err(info->dev, "ep93xx framebuffer bug. phys addr (0x%x) " - "has bit 27 set: cannot init framebuffer\n", - phys_addr); + fb_err(info, "ep93xx framebuffer bug. phys addr (0x%x) " + "has bit 27 set: cannot init framebuffer\n", + phys_addr); dma_free_coherent(info->device, fb_size, virt_addr, phys_addr); return -ENOMEM; @@ -525,7 +525,7 @@ static int ep93xxfb_probe(struct platform_device *pdev) err = fb_find_mode(&info->var, info, video_mode, NULL, 0, NULL, 16); if (err == 0) { - dev_err(info->dev, "No suitable video mode found\n"); + fb_err(info, "No suitable video mode found\n"); err = -EINVAL; goto failed_resource; } @@ -554,8 +554,8 @@ static int ep93xxfb_probe(struct platform_device *pdev) if (err) goto failed_framebuffer; - dev_info(info->dev, "registered. Mode = %dx%d-%d\n", - info->var.xres, info->var.yres, info->var.bits_per_pixel); + fb_info(info, "registered. Mode = %dx%d-%d\n", + info->var.xres, info->var.yres, info->var.bits_per_pixel); return 0; failed_framebuffer: From patchwork Tue Jun 13 11:06:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107280 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461485vqr; Tue, 13 Jun 2023 04:13:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5vYDMl5jgdjgprDYd9XVP1Me5v7Gf/feYXzmP4OYuxIIXmwMbJbxvy5/RuyUw+/s4OKFQs X-Received: by 2002:a05:6402:47:b0:50b:c56c:43d0 with SMTP id f7-20020a056402004700b0050bc56c43d0mr8063597edu.1.1686654781358; Tue, 13 Jun 2023 04:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654781; cv=none; d=google.com; s=arc-20160816; b=pHnEDitLN3cUwlc619OTWNxBUCkUbbXokhpA5Vifq8sC86y+SQox/SzCr5XygONq0g dm1ACeJDZ3rkWtDEjEq6qtGeql54VomNd/y3IxfKkgGm/U0Em7//Qw9H6CaN7KFtpCmM huLwM8lipC8ej+fZ4rlggWcv0gBWVKZDY+JrbRhKSOEzPezerLC6pk8W+R2mxxYe5y7K 6xgxHpY6uY/LcKOTdYOW+NJGMXjJ939Q4c5aVl0rWDDxdxXSj+FD74rCx8ocX4cJF1uk ZZWE0UdbiypelqRqkK2+Ds9vgtJZMOD3bfmkZ+zI/7Kt/z5kE4+vLGaZoy3TVu0PrySN d+Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=7UD3qH0Jecnz6Jrwvr3w6k9CQhko83sOH0nBzjwfJ48=; b=0vT5gGY/nI9fkSc0sXXCpcc3gEsnufzSB2dYz/dGPC6LUteqdoM63gZaVt5XaE4Kzq c2wkBRqK0tWUr6moRrGzYm5/iF2DscsbgbTXwBZUj/YQKz1lT+Cqxdfjdh6uaWkyiQuj B9PiZoxNvbOR1V+Ol/XDgYgkYwXSHNA6jxvINwH7n6aerBR2S+0vc380Ffq+xmDOGqee VHvbNOEFzTOTfLPk8I3vP53uyjOT7Zo7GqWSpiZmBMiqVnhoJjjZcLR9gFhKKxYEZZJW HkQssiKOM+fqgsD4prJ5wWagDt/aJWNvwFFEKgMKHaj0KWTbdJhWkZFWB3NxP7GTGPX2 9E8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=RhPAcbmS; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=g33LnGgT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m15-20020aa7c2cf000000b0050bc4575219si3125601edp.607.2023.06.13.04.12.30; Tue, 13 Jun 2023 04:13:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=RhPAcbmS; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=g33LnGgT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234648AbjFMLLA (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242103AbjFMLKD (ORCPT ); Tue, 13 Jun 2023 07:10:03 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F75B10E3; Tue, 13 Jun 2023 04:10:02 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E36212240B; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654600; h=from:from:reply-to: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=7UD3qH0Jecnz6Jrwvr3w6k9CQhko83sOH0nBzjwfJ48=; b=RhPAcbmSSJszenRxT7RweffotDn1VlilAc5nKqiKeksrW7Zoy0GJ/QD2XVTPmx86IveCTq MclrcRrDtVm+H726MshQbbouWH6AfT6m0TaID+Td6UmqMRxhiLaTIH/JpdDRd8xtIqpNrD 7Manifhngao7sBP/4Of4HmB/mF9TEzQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654600; h=from:from:reply-to: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=7UD3qH0Jecnz6Jrwvr3w6k9CQhko83sOH0nBzjwfJ48=; b=g33LnGgTYSqQL3eYebYg+/jQAyfoEP6/IlbRVr7g0h90lYz1Q5MWF0qLW2LL9Oh9m/RW8o lv3qYaTcqQ1P/NDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9B86C13483; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id aB03JYhOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:00 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , stable@vger.kernel.org Subject: [PATCH v3 14/38] fbdev/ep93xx-fb: Do not assign to struct fb_info.dev Date: Tue, 13 Jun 2023 13:06:49 +0200 Message-ID: <20230613110953.24176-15-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585724022690636?= X-GMAIL-MSGID: =?utf-8?q?1768585724022690636?= Do not assing the Linux device to struct fb_info.dev. The call to register_framebuffer() initializes the field to the fbdev device. Drivers should not override its value. Fixes a bug where the driver incorrectly decreases the hardware device's reference counter and leaks the fbdev device. v2: * add Fixes tag (Dan) Signed-off-by: Thomas Zimmermann Fixes: 88017bda96a5 ("ep93xx video driver") Cc: # v2.6.32+ Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/ep93xx-fb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/fbdev/ep93xx-fb.c b/drivers/video/fbdev/ep93xx-fb.c index f6cd200fe50ff..37309f9dbe828 100644 --- a/drivers/video/fbdev/ep93xx-fb.c +++ b/drivers/video/fbdev/ep93xx-fb.c @@ -474,7 +474,6 @@ static int ep93xxfb_probe(struct platform_device *pdev) if (!info) return -ENOMEM; - info->dev = &pdev->dev; platform_set_drvdata(pdev, info); fbi = info->par; fbi->mach_info = mach_info; From patchwork Tue Jun 13 11:06:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466298vqr; Tue, 13 Jun 2023 04:21:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6RxXBHKUcPoMx4dZIqmMbyLmQJ6J3Z3NAkiBaRHHLCPlbVHJ97HvJmbbIloHC86AnzU7x8 X-Received: by 2002:a05:6830:1d57:b0:6af:8e73:786b with SMTP id p23-20020a0568301d5700b006af8e73786bmr9240640oth.5.1686655295559; Tue, 13 Jun 2023 04:21:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655295; cv=none; d=google.com; s=arc-20160816; b=dhIT8e+Jbxh+b4xDkg6VEystRIpjjiV/7PBhsmjk58pnkH3V9xpJ1w1pSnPSlJ/azK EeXDD4XdhlEyVnos8fGtijtziRYCfnvJy07pg0oVJq8Y3b0AnvXAWKIpGzZ4n35LzweE JK+5fmTTFe79Q9xKMjO42jdee0FnmE+zRnI+1QH9SJ4bGiaVO9ommMdjqwdM1Rgxz8+x pJ918PYVEUfxbA8IofzVFIcwXWFkoGQrXhLtPmXE2Jj5EMQ6bc0jB5Xi5TqrrcNSfqGb LDRCyMwFkpbg8U0FS/9ymWHXkcbY2MU6Y08T/PM2JlKJYdtztCXGY8/tRjN3BMxX5uZJ f5Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ZgRWkj4ohO0KZCbdDBuPVV97H141ZbSM13kcN600c2k=; b=pklUNgYtT216uILOLhmr7EJ1EYjGKOMO3c1Nsby/sKV8E2Psj81ZFpFKHV/I9Q8jj0 RHF3s3YrE5sK5HfZTu6j19USf3BxSkUjphUcoaJ0vg3SRaVvwN6VWTxoheQTJsydKpex 84Muhx5mS7phDkJCTXIPPquQ5r3pwqKXwPVoMvZx3FrA/UtX68uVrS6KvjvMRKyAyKWT J3GPlRkoYVreVyv1QYLCin5ctxmtd95+4sspgUI3rhHmFO99gG8a0PmWo7qyO+DqihRx kuuSeRxemhSgJZZzQdSsDveOeRRoPvwpGv+4e0eUi68d5Tq8QTbkSET4wQlH1eiLKWhn s/RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=zbJ6q17g; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=pIjnNyxv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id az9-20020a056a02004900b00543ae670bbesi4760882pgb.794.2023.06.13.04.21.22; Tue, 13 Jun 2023 04:21:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=zbJ6q17g; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=pIjnNyxv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242212AbjFMLK4 (ORCPT + 99 others); Tue, 13 Jun 2023 07:10:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242104AbjFMLKD (ORCPT ); Tue, 13 Jun 2023 07:10:03 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 870AB10DA; Tue, 13 Jun 2023 04:10:02 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3B5C01FD9B; Tue, 13 Jun 2023 11:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654601; h=from:from:reply-to: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=ZgRWkj4ohO0KZCbdDBuPVV97H141ZbSM13kcN600c2k=; b=zbJ6q17gN8z70oqaqKqYOGRakhvg0MbJtIIg+o+DeiVqehX4j9aCFpHcRwxRU7Z7rTKQ5t f2HvzzQ9ZUU7AlYT3riteoeQJIFhBNK0hiqqcaAKRYURq+VplkkzBMg+g1sCN1U6pkFzi3 R00/iqjza3qieg7tUoKlcDTqAiYBjMk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654601; h=from:from:reply-to: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=ZgRWkj4ohO0KZCbdDBuPVV97H141ZbSM13kcN600c2k=; b=pIjnNyxvGQUaS/zeU12bEmPVy9t4gCOAOw0wkygp3pDUeluFfLgW/eBwzhfSOeCSyTtNPF rxGmQ9YXgFdbbCCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E667E13A47; Tue, 13 Jun 2023 11:10:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UNF+N4hOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:00 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Timur Tabi Subject: [PATCH v3 15/38] fbdev/fsl-diu-fb: Output messages with fb_*() helpers Date: Tue, 13 Jun 2023 13:06:50 +0200 Message-ID: <20230613110953.24176-16-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586263210426074?= X-GMAIL-MSGID: =?utf-8?q?1768586263210426074?= Fix cases were output helpers are called with struct fb_info.dev. Use fb_*() helpers instead. Prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Cc: Timur Tabi Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/fsl-diu-fb.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c index 730a07d23fa92..785eb8a06943f 100644 --- a/drivers/video/fbdev/fsl-diu-fb.c +++ b/drivers/video/fbdev/fsl-diu-fb.c @@ -872,7 +872,7 @@ static int map_video_memory(struct fb_info *info) p = alloc_pages_exact(smem_len, GFP_DMA | __GFP_ZERO); if (!p) { - dev_err(info->dev, "unable to allocate fb memory\n"); + fb_err(info, "unable to allocate fb memory\n"); return -ENOMEM; } mutex_lock(&info->mm_lock); @@ -1145,7 +1145,7 @@ static int fsl_diu_set_par(struct fb_info *info) /* Memory allocation for framebuffer */ if (map_video_memory(info)) { - dev_err(info->dev, "unable to allocate fb memory 1\n"); + fb_err(info, "unable to allocate fb memory 1\n"); return -ENOMEM; } } @@ -1277,16 +1277,16 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, if (!arg) return -EINVAL; - dev_dbg(info->dev, "ioctl %08x (dir=%s%s type=%u nr=%u size=%u)\n", cmd, + fb_dbg(info, "ioctl %08x (dir=%s%s type=%u nr=%u size=%u)\n", cmd, _IOC_DIR(cmd) & _IOC_READ ? "R" : "", _IOC_DIR(cmd) & _IOC_WRITE ? "W" : "", _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd)); switch (cmd) { case MFB_SET_PIXFMT_OLD: - dev_warn(info->dev, - "MFB_SET_PIXFMT value of 0x%08x is deprecated.\n", - MFB_SET_PIXFMT_OLD); + fb_warn(info, + "MFB_SET_PIXFMT value of 0x%08x is deprecated.\n", + MFB_SET_PIXFMT_OLD); fallthrough; case MFB_SET_PIXFMT: if (copy_from_user(&pix_fmt, buf, sizeof(pix_fmt))) @@ -1294,9 +1294,9 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, ad->pix_fmt = pix_fmt; break; case MFB_GET_PIXFMT_OLD: - dev_warn(info->dev, - "MFB_GET_PIXFMT value of 0x%08x is deprecated.\n", - MFB_GET_PIXFMT_OLD); + fb_warn(info, + "MFB_GET_PIXFMT value of 0x%08x is deprecated.\n", + MFB_GET_PIXFMT_OLD); fallthrough; case MFB_GET_PIXFMT: pix_fmt = ad->pix_fmt; @@ -1375,7 +1375,7 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd, } #endif default: - dev_err(info->dev, "unknown ioctl command (0x%08X)\n", cmd); + fb_err(info, "unknown ioctl command (0x%08X)\n", cmd); return -ENOIOCTLCMD; } @@ -1543,21 +1543,21 @@ static int install_fb(struct fb_info *info) } if (fsl_diu_check_var(&info->var, info)) { - dev_err(info->dev, "fsl_diu_check_var failed\n"); + fb_err(info, "fsl_diu_check_var failed\n"); unmap_video_memory(info); fb_dealloc_cmap(&info->cmap); return -EINVAL; } if (register_framebuffer(info) < 0) { - dev_err(info->dev, "register_framebuffer failed\n"); + fb_err(info, "register_framebuffer failed\n"); unmap_video_memory(info); fb_dealloc_cmap(&info->cmap); return -EINVAL; } mfbi->registered = 1; - dev_info(info->dev, "%s registered successfully\n", mfbi->id); + fb_info(info, "%s registered successfully\n", mfbi->id); return 0; } From patchwork Tue Jun 13 11:06:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466735vqr; Tue, 13 Jun 2023 04:22:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4+0ua9Sjwf7F9UDQgVnmiynz8/pkqvJqg4ewsh2ygk00whK73A+XaAz49IkT+Z5oheL2mq X-Received: by 2002:a17:90a:d3cf:b0:256:cf04:f8f7 with SMTP id d15-20020a17090ad3cf00b00256cf04f8f7mr11181355pjw.29.1686655345799; Tue, 13 Jun 2023 04:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655345; cv=none; d=google.com; s=arc-20160816; b=tMLJlri/sQISk6HveK0wTRVAK6TyN3+Vcxh5B6Mma+4Hnd4feVgGWlh1XeK7yJ82zm p0gKHfS++92kze78aLlGp2ciRGn7G7LiNQpOlLJ4wWeWsJUYSPpkIhewfteZWe5n9KMA RNovnF322ZjlwG4apfKJTr/hmyvWIKxZaSI8N5jF2GsJHf6KXq+F2YlJZD/P6daHUhn9 aP7hBLcOCTzOWIaoI69raHrdoGWMn0OgJjkHMhdjx9zQiNThmV2K1U4PhZ3tPE7S3U3r lwLqwOypazwlEuMuk0FYQRIFk5iCqv6MnmHcBKm1QgiOwTe+Q60bMHuS4E+Y443IoCCY hUQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=SP5XPQ+B+tBgODPORD3Z9zsr7bRrI+Ip0rV0x56IK2w=; b=JSsFZwZIGfiA3pKzWnoe9MyHht5nKhH4R1Nlv/tNPKvMpBGCQ49TWv0fGPnb2wnVvu JYUUk1NiKTA3QFyOYD/gFMRWymj809x4e8/A2gYRqB3B0Akrj/EVNPMak/bZHCCaZrob lBAq0hnK+i+lljI2hY13biTHLYwC7viOsL9EpXx11wcURYC3opLlRg7O72mS3LE+NZfD 4xxPt1I4Eofdh5aNX7oelDsSc7UFZOsHrMAIyGFeClAue6y432W+Lo8eyEzSvt1UyqIz 35gPwx54A+mGd5GQ4jW6KBI4+0As/1X9z9CJ1IEhaRE1ce0pNOySL5WksAG+nyokXGgJ nS1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pTSICEX1; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u63-20020a17090a51c500b002569b9b4397si10457601pjh.47.2023.06.13.04.22.13; Tue, 13 Jun 2023 04:22:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pTSICEX1; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242025AbjFMLLW (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242105AbjFMLKE (ORCPT ); Tue, 13 Jun 2023 07:10:04 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFBC410DE; Tue, 13 Jun 2023 04:10:02 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8137A2240D; Tue, 13 Jun 2023 11:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654601; h=from:from:reply-to: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=SP5XPQ+B+tBgODPORD3Z9zsr7bRrI+Ip0rV0x56IK2w=; b=pTSICEX1c8Qsm19zd8eQCOJmYryvMjO4aaOSHlOwtXah5fzubr34ywOkPBk4udx7Cd8n99 Qogm1Tg5gQANMUt14YBudjAK4+V0BX1XBy+bxA2fQQDpo10af0cqtvdgcZbgBS0ghOnZiJ JCTCiP5206NMjTAyMPMCilRo+t0oVgU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654601; h=from:from:reply-to: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=SP5XPQ+B+tBgODPORD3Z9zsr7bRrI+Ip0rV0x56IK2w=; b=9Ocgsrqyr17hP8X9xHsC/t7ebR3q+Nbnf3ogJQ3SjTVVLWEjLKHtw3tY3i4JoL3nQy+/SE YEXpcN8c7ALLfPCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3CF8A13483; Tue, 13 Jun 2023 11:10:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mAscDolOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:01 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 16/38] fbdev/mb862xxfb: Output messages with fb_dbg() Date: Tue, 13 Jun 2023 13:06:51 +0200 Message-ID: <20230613110953.24176-17-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586315973450333?= X-GMAIL-MSGID: =?utf-8?q?1768586315973450333?= Fix cases were output helpers are called with struct fb_info.dev. Use fb_dbg() instead. Prepares fbdev for making struct fb_info.dev optional. v2: * fix another reference to struct fb_info.dev (kernel test reobot) * remove fb_err() from commit message Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c index b5c8fcab9940d..119c2a582ecbd 100644 --- a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c +++ b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c @@ -112,8 +112,7 @@ static int mb862xxfb_check_var(struct fb_var_screeninfo *var, { unsigned long tmp; - if (fbi->dev) - dev_dbg(fbi->dev, "%s\n", __func__); + fb_dbg(fbi, "%s\n", __func__); /* check if these values fit into the registers */ if (var->hsync_len > 255 || var->vsync_len > 255) @@ -290,7 +289,7 @@ static int mb862xxfb_blank(int mode, struct fb_info *fbi) struct mb862xxfb_par *par = fbi->par; unsigned long reg; - dev_dbg(fbi->dev, "blank mode=%d\n", mode); + fb_dbg(fbi, "blank mode=%d\n", mode); switch (mode) { case FB_BLANK_POWERDOWN: @@ -791,7 +790,7 @@ static void of_platform_mb862xx_remove(struct platform_device *ofdev) resource_size_t res_size = resource_size(par->res); unsigned long reg; - dev_dbg(fbi->dev, "%s release\n", fbi->fix.id); + fb_dbg(fbi, "%s release\n", fbi->fix.id); /* display off */ reg = inreg(disp, GC_DCM1); @@ -1138,7 +1137,7 @@ static void mb862xx_pci_remove(struct pci_dev *pdev) struct mb862xxfb_par *par = fbi->par; unsigned long reg; - dev_dbg(fbi->dev, "%s release\n", fbi->fix.id); + fb_dbg(fbi, "%s release\n", fbi->fix.id); /* display off */ reg = inreg(disp, GC_DCM1); From patchwork Tue Jun 13 11:06:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp463904vqr; Tue, 13 Jun 2023 04:17:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7y03zQw+yJpui8rzIqBMLSQAquZH2oYi6pr0Ea87gvtLxEUmMWDyTiog6AojAg7eyHmMGE X-Received: by 2002:a17:906:d54b:b0:978:94b1:25ac with SMTP id cr11-20020a170906d54b00b0097894b125acmr15256323ejc.40.1686655030062; Tue, 13 Jun 2023 04:17:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655030; cv=none; d=google.com; s=arc-20160816; b=Ed1lArx5eJiznx0vQFE2Zi+nqX47xbXOsfi2AHAZ/m8jjU5csNSU/90pRiPJcN9sM7 kuYcG3h8/3mBdFRTE5y5s8PgslehAr0MgWMblQjr4rIe/GGfXneG20xhT6GRFIdHvHIN k0j4+fQzr8jtGpG0c0eGjaz0k1vg6nGylr9PWgzjb3burq8BELWqATbPG1ouJfY4xpvq 15nIpEZe/NZd9LtkJz9CtgDu8ZQlk4nHb9TKki1JGwXkK/f//odaX4zmEXDMxQxUhRKe l8uD+IjPmdplqNxlSaHfoO1w5pctqfAyFnXVNsKz5Cgom65jzaGahLhA7WS981LYMUm3 1YWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=pRVEdK0qqrxfZ1WPdASb24zppir7QMxRATYQwzniLIw=; b=vV4E5HHXyKjY9xbUaqYwgNG/7WEauSmmmQZNLF56nY73PR4VRDPPNPj5lK2xpVEC6A Hb18WCr6TEqpL5NZqGxQv+My8z/b6GIuTrYFELTvKBLubGcAAFUmuV4ZuMSgCBzPHt/0 8vSbpuBTd/nAVUCW281JL5BoigsP0z6gt8z+6a977gwLT225r0f2CmPg+e8FCbqCIS+w byKdAzfiQdxDfdVkUa4ceYuzAK5LJXETQ+ajS1vW8XCPU6HWALkkbCwR/p5DNtvwAlDf qg0QjvWKjSWpHdcAodEEA6aoCwU3dutke96ii4OIsS3+XcElGZPSzUmD7bF/9rKSkB2l n6mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=G48Skz6I; dkim=neutral (no key) header.i=@suse.de header.b=ij1OplNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mc2-20020a170906eb4200b0094f329b847asi6502688ejb.852.2023.06.13.04.16.40; Tue, 13 Jun 2023 04:17:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=G48Skz6I; dkim=neutral (no key) header.i=@suse.de header.b=ij1OplNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241827AbjFMLLP (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242106AbjFMLKE (ORCPT ); Tue, 13 Jun 2023 07:10:04 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20C1692; Tue, 13 Jun 2023 04:10:03 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C5F9C1FD9E; Tue, 13 Jun 2023 11:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654601; h=from:from:reply-to: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=pRVEdK0qqrxfZ1WPdASb24zppir7QMxRATYQwzniLIw=; b=G48Skz6IiEfIjDuhBzm3x8fAKscJD+q6Uc3kbkCjkYeGFVn2zHueRO51DGKJ+3RaC2w9gi QZ3zRm5UiwME86d6uko7lw2fvY1BHdOiG6zLLkJTkonLwlMGF+7/f6UsbEiJul0DkYF319 cgTay0ntAN/WtcJcYJeumWQ+rYga17w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654601; h=from:from:reply-to: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=pRVEdK0qqrxfZ1WPdASb24zppir7QMxRATYQwzniLIw=; b=ij1OplNTEHT7+l+qCaB0zdtGdRp1km6eoiy+FciawN0G21ZnehaPO/CQQWc/0c9HX+s3Lu kuC1L0HUr/7H3hDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8266613A47; Tue, 13 Jun 2023 11:10:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 6HAZH4lOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:01 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 17/38] fbdev/metronomefb: Use hardware device for dev_err() Date: Tue, 13 Jun 2023 13:06:52 +0200 Message-ID: <20230613110953.24176-18-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585984695360500?= X-GMAIL-MSGID: =?utf-8?q?1768585984695360500?= Replace the use of the fbdev software device, stored in struct fb_info.dev, with the hardware device from struct fb_info.device in load_waveform(). The device is only used for printing errors with dev_err(). This change aligns load_waveform() with the rest of the driver and prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/metronomefb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c index bac255c749e78..3e1daca76e114 100644 --- a/drivers/video/fbdev/metronomefb.c +++ b/drivers/video/fbdev/metronomefb.c @@ -181,7 +181,7 @@ static int load_waveform(u8 *mem, size_t size, int m, int t, int mem_idx = 0; struct waveform_hdr *wfm_hdr; u8 *metromem = par->metromem_wfm; - struct device *dev = par->info->dev; + struct device *dev = par->info->device; if (user_wfm_size) epd_frame_table[par->dt].wfm_size = user_wfm_size; From patchwork Tue Jun 13 11:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466266vqr; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4f/LC66NUDnV7M1F/w8/Ci6fR9+roTvcccOP78/S3JO8rp9Y25lsAZ6jEGMinIYkp68wGI X-Received: by 2002:a05:6808:1596:b0:398:7db6:7ee3 with SMTP id t22-20020a056808159600b003987db67ee3mr8439247oiw.19.1686655292291; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655292; cv=none; d=google.com; s=arc-20160816; b=eXKrrh8BZcn0hBTzMQ2rtnN+pnHRbS+fLykLuDYe+lCBRtT7ISspYDStpZIbvjzXul GeIVzczXYwUpROAmqeiu75YOAXWfXIwCyMj8Rn8FDGdiZNQz23CHdnAI0SRjYr9Z7jxv EK0CFPKnuR5p3Yo/jYkeKR17NBsFzYjddhJbgkjR3JSEiuTuJhQNfFZXOyscN+Lof0z7 g+zUv/RiIInNVEKwnQhLkkViLVRRvu/eKBlO0Pd/O7a8NOF7dB5elqolP1dR7R9YMCUA WAEb8MfOfgmL/Em1hmH6klTFCq75aukdZkBWIuknDdlX5+KTJ1RUo+4b0hLxftmhz2jC NOiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=8X3yQyHtdAGbqV8Nngj4Yuzd3t4nUJygtIKDANSM4Nc=; b=xkJVIHug4LSsrCa8120eTzav0c/Ghue/LGtlTuQY4rgPoWJiHPXDjqGBfV39AgWN0+ rTfUKSWMWcKKOjptXETz+NY6spjbX+84b7oRICpXVKP/FlszzTS/oRqVtDa1eqrYiqlr RhEwABu0DVO8cM48ERYAcTkoVmUF1y3+ShnQIjpLk41fKODvmyuWK/lFryuYjEiBI1WU xDNg2PFJMzzVj80ATOhhL/keATOHX+2kBWMt+Ul8PqFlER+rhkYr3u1HNEr7rWy+nwyf YCN3ffkrMXmQiFdFxF7+pCz9Wk+ND9Ye8NoAolxYptuiKOKMWTQaCsoJmkskQQp6QwY5 h/tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=fb7NQvig; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nh11-20020a17090b364b00b0025bf9d28b28si2241592pjb.104.2023.06.13.04.21.19; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=fb7NQvig; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240826AbjFMLLN (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242107AbjFMLKE (ORCPT ); Tue, 13 Jun 2023 07:10:04 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D81A10E2; Tue, 13 Jun 2023 04:10:03 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1F9B81FD9F; Tue, 13 Jun 2023 11:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654602; h=from:from:reply-to: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=8X3yQyHtdAGbqV8Nngj4Yuzd3t4nUJygtIKDANSM4Nc=; b=fb7NQvigOWfhSdnOuUEs6DjDj7KZWtfFk1LzP6QBPaIkgtQA5InjB14ZVT6672flPB+BLs 7w5vg5hCN0Jx0MbRsSJPXZut1QFSlUmzbWVrOzVxgurthL+kr/m7rGCTZ+tegz7usQXpVE Ri1EkrJzKAAVLZkzXsdMVwoyIh2UVts= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654602; h=from:from:reply-to: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=8X3yQyHtdAGbqV8Nngj4Yuzd3t4nUJygtIKDANSM4Nc=; b=AdvR9dycWkCIy6DpzBXW2dHx5vLGmuDV3+7VOZjIDE3AeDwVemIh4qXwnOxeWXTr9GiIpS yIcMhODSkwuCGaDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C842213483; Tue, 13 Jun 2023 11:10:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wDweMIlOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:01 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Antonino Daplas Subject: [PATCH v3 18/38] fbdev/nvidiafb: Reorder backlight and framebuffer init/cleanup Date: Tue, 13 Jun 2023 13:06:53 +0200 Message-ID: <20230613110953.24176-19-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586259823802572?= X-GMAIL-MSGID: =?utf-8?q?1768586259823802572?= The driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures. Signed-off-by: Thomas Zimmermann Cc: Antonino Daplas Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/nvidia/nvidia.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c index ea4ba3dfb96bb..039e886346fa6 100644 --- a/drivers/video/fbdev/nvidia/nvidia.c +++ b/drivers/video/fbdev/nvidia/nvidia.c @@ -1400,14 +1400,14 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) pci_set_drvdata(pd, info); - if (backlight) - nvidia_bl_init(par); - if (register_framebuffer(info) < 0) { printk(KERN_ERR PFX "error registering nVidia framebuffer\n"); goto err_out_iounmap_fb; } + if (backlight) + nvidia_bl_init(par); + printk(KERN_INFO PFX "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n", info->fix.id, @@ -1439,9 +1439,9 @@ static void nvidiafb_remove(struct pci_dev *pd) NVTRACE_ENTER(); + nvidia_bl_exit(par); unregister_framebuffer(info); - nvidia_bl_exit(par); arch_phys_wc_del(par->wc_cookie); iounmap(info->screen_base); fb_destroy_modedb(info->monspecs.modedb); From patchwork Tue Jun 13 11:06:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466262vqr; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5x6Oo2C/uwgR9QVnPPXkYm6OhMD2Ay5jELWUdUg6pUqPW92tWdZVV1pOjXbfT0wrtm9Awt X-Received: by 2002:a9d:750a:0:b0:6b2:5aec:b5c5 with SMTP id r10-20020a9d750a000000b006b25aecb5c5mr9455286otk.11.1686655292308; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655292; cv=none; d=google.com; s=arc-20160816; b=nTQFVCpYVCnacTN4nn/5M0c7k0UjmA46lZrajCepJi33wBs67AE3f1fEjIv7F8DgCP jW68BRTRKgf1EgcoosKKdCSGiSMj5g9u58R2IARiQkQOy/kNESoBK4fu4cMTTF2AQetv B5l+b2xmB4QMY+S+gVMTb2/mIVHW6yU6V89sjizu+Li+rMPt2Eg4ICC0JoOEBy4XPBAI sA5bTaZt+oEsPKbJ319EntvMPqRbdlKCIr5HmrJLSbyObpsIZ9rJhJCgDpaBClCXJ834 mP39V05jBLcnlhamiTgDOm1YEgn5lhzesG+UHLncVaD/G6cHHBSEsCyiapASGAUat7lc uk0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=cRJCI1DQyCCftvFjU3f789NQ4HahDIyRoVbm/3ldQBA=; b=X3Err5D3CfQ/4HSQLmPNIKiAENXiuR21DkrSEGhKmekcxNxboqzqHb5MGgv2Pvf4Kn sKjCVcV5HwJofdUmrrSlko60PgeYR5psKDW41xUJoiGy5ibifJ0o8nfBkg9AyV2AbWjz 6DUjjeBrFNNqTzhbLQhsaj8rwUcg5ApdkcSmq7rtXMsr/o5eTb38N3Qj3WV6vZZz4f1C hG6KMs3N8ROw1l3PHVtzCF4oxGXa6KPUolDD0x0RGDAn8zhUMOH/khQMWzNH2yZiF2ME nxZUhON0WOrkJinkferqmZ8ZK2st28NqVB6aSr0LXUeoRoXNpLpv6W+/W3pl+1tz1cEw K8ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=TNbrvrjT; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m125-20020a633f83000000b0052cad187979si5943777pga.147.2023.06.13.04.21.19; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=TNbrvrjT; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241910AbjFMLLm (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242109AbjFMLKE (ORCPT ); Tue, 13 Jun 2023 07:10:04 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD5FAE52; Tue, 13 Jun 2023 04:10:03 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 72D5722422; Tue, 13 Jun 2023 11:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654602; h=from:from:reply-to: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=cRJCI1DQyCCftvFjU3f789NQ4HahDIyRoVbm/3ldQBA=; b=TNbrvrjTZ/MF6TDgcloaNlx9L7iyKuiH+xSnSkMWgt4Yf8HIWd4XKJxSqC/rmdVLAMogUg NoR83gzOeP/cJhElTeecPOBWP8bLNuKUeFQKgI/MhDB4gxUyBagAnXv3au6NSFmwTr0Bx2 6AfaUvpNF3s+9Sl7XQlwbpUFBapaJW0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654602; h=from:from:reply-to: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=cRJCI1DQyCCftvFjU3f789NQ4HahDIyRoVbm/3ldQBA=; b=jz0m4YdfgQIYkF8jd3kA0FNs+89zJX2jgMK6U+4ASaeVPdbktSEB9iDt+XFjjkkUc9gq86 jW8IfeJ4jc2u/qAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 23EE913A47; Tue, 13 Jun 2023 11:10:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wBzGB4pOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:02 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Antonino Daplas Subject: [PATCH v3 19/38] fbdev/nvidiafb: Use hardware device as backlight parent Date: Tue, 13 Jun 2023 13:06:54 +0200 Message-ID: <20230613110953.24176-20-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586259874800155?= X-GMAIL-MSGID: =?utf-8?q?1768586259874800155?= Use the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Cc: Antonino Daplas Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/nvidia/nv_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/nvidia/nv_backlight.c b/drivers/video/fbdev/nvidia/nv_backlight.c index 503a7a683855a..160da9c50a52c 100644 --- a/drivers/video/fbdev/nvidia/nv_backlight.c +++ b/drivers/video/fbdev/nvidia/nv_backlight.c @@ -98,7 +98,7 @@ void nvidia_bl_init(struct nvidia_par *par) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = FB_BACKLIGHT_LEVELS - 1; - bd = backlight_device_register(name, info->dev, par, &nvidia_bl_ops, + bd = backlight_device_register(name, info->device, par, &nvidia_bl_ops, &props); if (IS_ERR(bd)) { info->bl_dev = NULL; From patchwork Tue Jun 13 11:06:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107305 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466809vqr; Tue, 13 Jun 2023 04:22:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5LVGY2yLeplyOOCoZHYjO9uZ2wzLT+QIDZi7nVvF4Z7cF5Z1yHjHISGjGY/k/dYFAlKNK2 X-Received: by 2002:a05:6a20:382:b0:10f:130c:53e4 with SMTP id 2-20020a056a20038200b0010f130c53e4mr9081281pzt.41.1686655352224; Tue, 13 Jun 2023 04:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655352; cv=none; d=google.com; s=arc-20160816; b=hcp8UNV5jHidE5nJzxdsKbr3eESzar5o3n1Q4RgxPSA5vr/G4rOcRLuYemTY6WSPLA Slg72USt5kRCVrSMr3kiJAtTV3JPJE0HqblZaDIomymCA08muecu7GTosB1sf/+UWN61 sioSTsiAs2rKJQr0WxtXaTyvXWLcKNzVjQzejtUk8zT8GnA5olwnyeX+tzPBjA2p1tdF uhG/axwwqmhSRH97i8lvJHvE9MxL2eWjzJDMAFf74E4Pexb5WNPNdbhsxtd7cew3nRCX IoNCjXt5DHvDlL4Z/i+qHfCQTDNtwij2ipxCC72ItWi+DPIDsw+mMyZbt3Ct05TibNI1 cT+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=iS75Sy8vxPdQTxKd8R/a14a55yT+9ZE1XrealkwT0x8=; b=sCBeO7a+TRpV1x6fIHKi+umJhp1OG5ljF5LgE3op3d4d5ZPllBaQJUVIS7p3U+ow8w 25/otGLNWATXNo7W6fVKbQZxxN6J8R60ivFUJe5f1eB8yk5CTUc7xoEdxvyrw0viBFJ6 biWs8qL+dKXqXvK9r7W3mdjGKB44Aap/Qdu2RDMyR4qJC8Eoe+O0KR0C9AeugYTtIQ+3 CtEliuQE7Oo6Xaqtbl91Z5rKLB58InZNN9i9fx7niL0YDDyXR+YUwXJj5/B5OzzWMtOo X+U+O8h6O+waZU5H3ifRe1H7zEmoDUws7AL/7N+6mlsozluuFtTHTTM7NY1pb5hlbtIS rReg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Q38CvPhE; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t190-20020a6381c7000000b00542ad9945f2si8559354pgd.647.2023.06.13.04.22.19; Tue, 13 Jun 2023 04:22:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Q38CvPhE; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242205AbjFMLLa (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242110AbjFMLKF (ORCPT ); Tue, 13 Jun 2023 07:10:05 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28D5810D8; Tue, 13 Jun 2023 04:10:04 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C0A3422416; Tue, 13 Jun 2023 11:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654602; h=from:from:reply-to: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=iS75Sy8vxPdQTxKd8R/a14a55yT+9ZE1XrealkwT0x8=; b=Q38CvPhEMtiNefeeOeH1vGahXu/yyy0YEhuBjm1JmUEEC2utiogyKVMwU96QYlrZmRp2nD Dyvccc3evDLBZrq8iVmZsLVgU5+gbhsRpe6eI42YxiU+Pyjzv0+FhtqX2B9wHg5QpORz8x q2CjPSlhB52ekQ5zyqMJwYdH7MJjCV0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654602; h=from:from:reply-to: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=iS75Sy8vxPdQTxKd8R/a14a55yT+9ZE1XrealkwT0x8=; b=EZDaB+E68NnQ724We9tBfV8Es66SWW3pJADfp5wqoGrgSipwtlYOzXaSRMxxOJW1+QIXad t+0OSOJDyYZhMvCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 75C3413483; Tue, 13 Jun 2023 11:10:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +JXYG4pOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:02 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 20/38] fbdev/pxa168fb: Do not assign to struct fb_info.dev Date: Tue, 13 Jun 2023 13:06:55 +0200 Message-ID: <20230613110953.24176-21-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586322462415094?= X-GMAIL-MSGID: =?utf-8?q?1768586322462415094?= Do not assign the hardware device to struct fb_info.dev. The field references the fbdev software device, which is unrelated. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/pxa168fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c index 79f3384630926..82cb9ffe52908 100644 --- a/drivers/video/fbdev/pxa168fb.c +++ b/drivers/video/fbdev/pxa168fb.c @@ -629,7 +629,7 @@ static int pxa168fb_probe(struct platform_device *pdev) fbi = info->par; fbi->info = info; fbi->clk = clk; - fbi->dev = info->dev = &pdev->dev; + fbi->dev = &pdev->dev; fbi->panel_rbswap = mi->panel_rbswap; fbi->is_blanked = 0; fbi->active = mi->active; From patchwork Tue Jun 13 11:06:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466820vqr; Tue, 13 Jun 2023 04:22:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5NEF9G05TT0yizxguz/6EigZaSuxyIpwgW4seiZl0YfWqMv+H8DI8oAvXgdd5lvgB6A17r X-Received: by 2002:a05:6a20:d387:b0:10e:f1e3:8217 with SMTP id iq7-20020a056a20d38700b0010ef1e38217mr11670750pzb.17.1686655353982; Tue, 13 Jun 2023 04:22:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655353; cv=none; d=google.com; s=arc-20160816; b=iLjIIWOgCTcul9/oo2Pk5aedbOeVG2vFjHsaJRYEvejFAKzrIq2GFQezZNCPpyRRJ7 j/wanCHdI8Weqj3sEgQCB6bHrydAc1cdnvZ+Yc7trMQJ4IsBgWVifoyUzOoimkqsbvlS L5amWv1Bc4fI4uEnyqmJMvp6VrNl3o490ewavuM3p+V89IvtTgTpPbF6BgQ45ZNPKMVa 3cAlSoiqCV8zgnKGHypF3Wp90KOsHpCBWr80p07gjZM/IFqtLvEzwhmfqZwKPhb84F82 bRTQ/etjQaqXT+EJgwBYNYdV2D97MNtD7xjwHRouSVgbuMxP8qeeNV5sQh38z9fhQSeu ck/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=NGKt5YmPhNCFqEoOeZiLZcdEnnocMclPxDtWyUC/Kws=; b=0vjVa1IeLa0GtsI6JVmJRH1LBfPwW0yi5/OFIHE8ZQAPPe8zyJmrTO7ZKqDkiHfp+h r1juJSDeM9ePX0EsrAj1h78r0opMkiKCbgI7XPY0uqfKxb8I24q4Ze8IFTDHmo2/O8yL 3Qe8RjotcdkrPAoyNAmMp/6Qy34FV07Di+2Cf65jAZdCIP0pBQnRAhha5N0AWW6QbD9g 5uoDB6vrBp4kqgZxCOx+86+f54vF/Onz12VlKSPNuC9WWw51ywlkg+8U+n4LyZ7nqi6/ 4VGpsoJhxSlAT4lPAXbdgQW0bV5d/eJzGtQH601kIoUvnlEfO0KA0mLPAimJcWjb6m87 LKKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Tc1BsX3p; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u17-20020a17090341d100b001ac4f733007si5866872ple.549.2023.06.13.04.22.21; Tue, 13 Jun 2023 04:22:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Tc1BsX3p; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241597AbjFMLLg (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242111AbjFMLKF (ORCPT ); Tue, 13 Jun 2023 07:10:05 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73A5910DA; Tue, 13 Jun 2023 04:10:04 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1E59022423; Tue, 13 Jun 2023 11:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654603; h=from:from:reply-to: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=NGKt5YmPhNCFqEoOeZiLZcdEnnocMclPxDtWyUC/Kws=; b=Tc1BsX3p0HnP5GYkZuvouwUtGzVdXJ8QomI5m6gNi4+dSOE68Ql3ETUIob7FKSWCa5wzlz tdzF6JjmVkueFqvflbvNFefyr4sQ4gQt8Z4u/Ugdzd728zo5dPcQjnt2a0mXZ3ZbFzKT2J +dDNgWoQmPXSK4sgZz2yfEamInAaB6I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654603; h=from:from:reply-to: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=NGKt5YmPhNCFqEoOeZiLZcdEnnocMclPxDtWyUC/Kws=; b=mL2yWxxh51btib5rJ9xuKTlgXIBc8I0aqq7adz1tM3dlh6ddchBEKdo0hx44/UyzJy9kfV /Qrh3lUw5jzq50Ag== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C45D313A47; Tue, 13 Jun 2023 11:10:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id AOwML4pOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:02 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Benjamin Herrenschmidt Subject: [PATCH v3 21/38] fbdev/radeonfb: Reorder backlight and framebuffer cleanup Date: Tue, 13 Jun 2023 13:06:56 +0200 Message-ID: <20230613110953.24176-22-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586324529731074?= X-GMAIL-MSGID: =?utf-8?q?1768586324529731074?= The driver's backlight code requires the framebuffer to be registered. Therefore reorder the cleanup calls for both data structures. The init calls are already in the correct order. Signed-off-by: Thomas Zimmermann Cc: Benjamin Herrenschmidt Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/aty/radeon_base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 972c4bbedfa36..8f2a527c26ebf 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2517,9 +2517,8 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev) del_timer_sync(&rinfo->lvds_timer); arch_phys_wc_del(rinfo->wc_cookie); - unregister_framebuffer(info); - radeonfb_bl_exit(rinfo); + unregister_framebuffer(info); iounmap(rinfo->mmio_base); iounmap(rinfo->fb_base); From patchwork Tue Jun 13 11:06:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466727vqr; Tue, 13 Jun 2023 04:22:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5uPmj0ssj2E2h4O8yb7gmRsr+oK1L5vxpeTLePRC40NahH4EMB8eyiKCodgVGMK6RixswP X-Received: by 2002:a17:90a:c909:b0:25b:ee97:5f7e with SMTP id v9-20020a17090ac90900b0025bee975f7emr3358562pjt.42.1686655344347; Tue, 13 Jun 2023 04:22:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655344; cv=none; d=google.com; s=arc-20160816; b=U/5FH19iOKph7DGwlgFeytPdmBcD+KxeDEgdG7wya63c3Pg9aZi/pNuKTziimQXeu/ sIafdq4lA0hjxIVgEHPckwxmb8pRaH/a8/9zBxBdzUSdMlSUmqdpKJtFoiCjNZY55pf2 BTldQjP0Z93+kEhgrcP76dnJe/Y0VY6NBErV4mFSvePOjF3kvijoCHvpOAtvovsCZenY qR+vOC7FpXI64KLQ3QG3DgIUse7Qg1bv9G9p8fAB2B5c9jjDE/Frt3GV6Y/Klw1eF8ZI Ez9HetwVgOEUq4zgUf4bUxWBWVw9iSMX3yVwLpjYDHz5gkmXANirqucAidv6fLjhvSED kHlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=UQPlVCoNyk1qRkb86F1S6ejVO3uXleDCgylKPJkMzac=; b=r6cR+NOsZTm79j8V3X2QFlYCphVTOm1mOY9w7+XEhXAgtv4sBMJKs8DEUqVgLId4h/ UO2CUvl1stpdzE/8kUiY6RB1+GR2bjh2WkwXNTWoAB2/XwsH288vnNvcDEk90U4vPTXq hs+GimviSvfORw9gJf7AikoeKTicJBoxoQ9FgVDUVWo6VDL9vxyURgkqP7wWd7ihBBHR 0RLAS8tm8kikCI8vccNsPgJejFu5mccc4gUek7WK1UJw+UpIwo8FoCachq2kxTdueFbe zyOwutaFEMgGEGQjDTOeSeGGXtQhmWFo2KImPoTCQJXMsu4psA1uWOox199GhEmYcOcR 7H3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=X5QHCpIa; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r84-20020a632b57000000b00542b5336becsi4718660pgr.663.2023.06.13.04.22.10; Tue, 13 Jun 2023 04:22:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=X5QHCpIa; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242146AbjFMLLZ (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242113AbjFMLKF (ORCPT ); Tue, 13 Jun 2023 07:10:05 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8B0492; Tue, 13 Jun 2023 04:10:04 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6F6122241B; Tue, 13 Jun 2023 11:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654603; h=from:from:reply-to: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=UQPlVCoNyk1qRkb86F1S6ejVO3uXleDCgylKPJkMzac=; b=X5QHCpIaFF1QFS2ynpI4urzXZi3mfmeazepnZG6M+AjlhWAvDz3l4rDJH4Drzb3EhoTIRa kzvCCZ1jfpEXfJ+kKTg7At8KhVOm/MkEUpu9/D6nCV1NtXQrEMNQsqQE6M7EdwFNiIOd7D iM7ADtpwUyAhlw9Vvo7JRfbLUM/BALM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654603; h=from:from:reply-to: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=UQPlVCoNyk1qRkb86F1S6ejVO3uXleDCgylKPJkMzac=; b=wwui3gQ+OWdcbUAjmCV0ljruVymKTdi4G9xRBJGjHads+HhDxZGAQSKlSnvp0sbQ/qW1bJ 4N/tVFqLpClyucAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 22E2413483; Tue, 13 Jun 2023 11:10:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kI5hB4tOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:03 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Benjamin Herrenschmidt Subject: [PATCH v3 22/38] fbdev/radeonfb: Use hardware device as backlight parent Date: Tue, 13 Jun 2023 13:06:57 +0200 Message-ID: <20230613110953.24176-23-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586314366045559?= X-GMAIL-MSGID: =?utf-8?q?1768586314366045559?= Use the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional. v2: * add Cc: tag (Dan) Signed-off-by: Thomas Zimmermann Cc: Benjamin Herrenschmidt Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/aty/radeon_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/aty/radeon_backlight.c b/drivers/video/fbdev/aty/radeon_backlight.c index 427adc838f77e..23a38c3f3977e 100644 --- a/drivers/video/fbdev/aty/radeon_backlight.c +++ b/drivers/video/fbdev/aty/radeon_backlight.c @@ -147,7 +147,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = FB_BACKLIGHT_LEVELS - 1; - bd = backlight_device_register(name, rinfo->info->dev, pdata, + bd = backlight_device_register(name, rinfo->info->device, pdata, &radeon_bl_data, &props); if (IS_ERR(bd)) { rinfo->info->bl_dev = NULL; From patchwork Tue Jun 13 11:06:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107307 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466952vqr; Tue, 13 Jun 2023 04:22:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ46yfM2lgQSzzJO5KCmRary5qXw6JCvBXb1cze/sCYWxbTODOpDybLbOvfnVS8VyKWQ02av X-Received: by 2002:a81:8202:0:b0:56d:2038:c254 with SMTP id s2-20020a818202000000b0056d2038c254mr1570524ywf.44.1686655366745; Tue, 13 Jun 2023 04:22:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655366; cv=none; d=google.com; s=arc-20160816; b=FMP2b+vhUTzxF0LvnS8uYn1j5fu9F9mxhVHNiGi/hdSmuVXarWmqktRrbBM1fuY0ph wJiKK5dxookRU8kqpHB3yxPkeVz8SLPpoHzxBcQrjbxnBQdgAF/guflSASHh8ghAMlnS uGzo4S6yfRpVq161TsMhBkiEeTfPh/hHFPvAAtL2/9zEhpYsxcinTbeh3qs9QRs9S+T5 O9Xqcng8asbsPQ+MFiyheQU2nz7bexIPAVGDwHNAph5QFjbT1CJgqilpuQVLlQVWAqVI 0wiLf/zeE1SfLyX1dMQo1c7N+ggNO5rq24Wv+QzNfZDj3YY0BKw2kATLeEeY/7vyCj50 x65g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=mJ/nRxPQNw0uGez00XvYITPK0wfTUkhidn6VLxYDusw=; b=Mc/yWiBHIXB0EXkRqAskLPu+7F/7V+ATDCDsWh1XNpyydjVQBxsW5ssYQIfsNnOMEt vrNDuZFQq5wMYsjxyNL7rGL16mJCPIGnUOLJUMXKzMAbHN0I5RPqafBjM+0rz0LjruT7 q8J7tRmwht0CYEZe+ISCeitd7c1V36mUhyLscmfKBvUNDYUkICOqNDj6wbjcZXm3Ec5L SxJWQydNYqTTh75JBnNqMQIETWLdWScgaKi8SgxeRXDnVbepJRnv1xWwrGUiLs41+ZKz 7mgpMPgeZPuzfdg3+nNIAmjP0cQJPF7mI7NCd4fPk1BzuFK2J1nUKSJyaqs/rI3s4rx7 JVfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=sZQj4OMG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=nNV3gFqb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u63-20020a17090a51c500b002569b9b4397si10457601pjh.47.2023.06.13.04.22.34; Tue, 13 Jun 2023 04:22:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=sZQj4OMG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=nNV3gFqb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242271AbjFMLLu (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242117AbjFMLKG (ORCPT ); Tue, 13 Jun 2023 07:10:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1911910DE; Tue, 13 Jun 2023 04:10:05 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id BFE1D1FD8F; Tue, 13 Jun 2023 11:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654603; h=from:from:reply-to: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=mJ/nRxPQNw0uGez00XvYITPK0wfTUkhidn6VLxYDusw=; b=sZQj4OMGghsfoNt+fasLFdaSC1gcXXlYbWzoRXrBw23jceukONP52CPC8x11a7nkX1SxqV fh56SI784o+cGc4LXTsZqr1UxFsijmGh4bPmARiSD/ijHApwf/h1yohcTECZjJlhOaQvmE nBfc7q0o9zl7JgDDP4T84e4LXDFvmT0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654603; h=from:from:reply-to: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=mJ/nRxPQNw0uGez00XvYITPK0wfTUkhidn6VLxYDusw=; b=nNV3gFqbUh+6nyEsVjB0HE1ujis7u3XbcppBXI9xeDZRmWooRCzEcLKoJo7YqEVT08qXQ5 3eLIGcy7ZLVLWqDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7328513A47; Tue, 13 Jun 2023 11:10:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EDpAG4tOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:03 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Antonino Daplas Subject: [PATCH v3 23/38] fbdev/rivafb: Reorder backlight and framebuffer init/cleanup Date: Tue, 13 Jun 2023 13:06:58 +0200 Message-ID: <20230613110953.24176-24-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586338214614200?= X-GMAIL-MSGID: =?utf-8?q?1768586338214614200?= The driver's backlight code requires the framebuffer to be registered. Therefore reorder the init and cleanup calls for both data structures. Signed-off-by: Thomas Zimmermann Cc: Antonino Daplas Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/riva/fbdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c index 41edc6e794603..e328b2d39e2b6 100644 --- a/drivers/video/fbdev/riva/fbdev.c +++ b/drivers/video/fbdev/riva/fbdev.c @@ -2031,9 +2031,6 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) pci_set_drvdata(pd, info); - if (backlight) - riva_bl_init(info->par); - ret = register_framebuffer(info); if (ret < 0) { printk(KERN_ERR PFX @@ -2041,6 +2038,9 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) goto err_iounmap_screen_base; } + if (backlight) + riva_bl_init(info->par); + printk(KERN_INFO PFX "PCI nVidia %s framebuffer ver %s (%dMB @ 0x%lX)\n", info->fix.id, @@ -2084,9 +2084,9 @@ static void rivafb_remove(struct pci_dev *pd) kfree(par->EDID); #endif + riva_bl_exit(info); unregister_framebuffer(info); - riva_bl_exit(info); arch_phys_wc_del(par->wc_cookie); iounmap(par->ctrl_base); iounmap(info->screen_base); From patchwork Tue Jun 13 11:06:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466548vqr; Tue, 13 Jun 2023 04:22:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Wxcl4PaimSKWmiKpoXuCBy4TUnKv8TEOpdmlQKkBRnk46ZzoLs0ds7I3iAQO11nqbQHNL X-Received: by 2002:a17:90a:4885:b0:259:42f2:1fd5 with SMTP id b5-20020a17090a488500b0025942f21fd5mr10220570pjh.26.1686655321606; Tue, 13 Jun 2023 04:22:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655321; cv=none; d=google.com; s=arc-20160816; b=XTKZg8OSD+ZGSCIrFAjen9mur4nXJgiy6QCPuQgEmGVFf+JYJCH6+ekVHmAtaDGSDr Sf/ns+2YyDicSi0PMG9UzXzhYTLlpTVwTLYMGbh2xrvFWvsKnKYDpAm2JMApuda96ypv RPWHDbixDI9AcU11GxO4qF8VrMs7u6bVj46n6bI4vpi+OJZWhWIq+CqNxrodWzjfiXEg G5GLl9Rk7nnxmQeSwYkew1PEZSlLc5jjv9HJsZ9gtqSeQ1Q6OlvHGyJutWbb+/vwWjRG bbne3rlVo6SdoBRr3P/fzPmx8MQcEEMdqE6wBb0dx7ErisZyZa6Kx5H0UJ0Bo9IqrQfk yajQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ez8WD5cRsRZqKCuv3LsW1Ei3OXKHBPi9iaji//6ZCPo=; b=fzMbZMcYARS9yT3u8SJlaQIJbV9iZCEXXpm2/Ni4pR9ByiZqav7mumnzazWy3+z9qT myvABZQ02BKwDh3LTMPeAcuSooWSgecZniVDGgRK29u48ZY+BmOZypW3EewfGCb8iszc TJTaGYcmnNOT4JNVcf910rVP/rV4y3T9I5VlM+Qp6Zx+dB6G5rxU9UXT+O61knhAnkaO 2m9Bpc35wKSRfasya8l/2Ns6tsqu9npcJJZMzWYsu9m7w3zVpLADrY92Oxg8ysT/A8hA cjmXv8DdFnFhvTB8gJfwIQwynhpuaEqUkHK1fg8m0jCPi4rUoq/5aCFG1UXr2JUTl4Ss 3w6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=evlweMYH; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id me2-20020a17090b17c200b0024e0eec665fsi5673106pjb.73.2023.06.13.04.21.49; Tue, 13 Jun 2023 04:22:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=evlweMYH; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242229AbjFMLL4 (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242115AbjFMLKG (ORCPT ); Tue, 13 Jun 2023 07:10:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DAFD10E2; Tue, 13 Jun 2023 04:10:05 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 198A21FD9C; Tue, 13 Jun 2023 11:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654604; h=from:from:reply-to: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=ez8WD5cRsRZqKCuv3LsW1Ei3OXKHBPi9iaji//6ZCPo=; b=evlweMYH6F6W1ZO5/DR1pUF6aqEG9s+J27wPP4rbpKUxUUS4JY+pVmsbvHmGAICz/ICk5e YShDuxP2C5sFDad1Iu2/OjE6uBichI7QodcVBkU+TJxlaxJEjF72+lynjNOJyzfXKCpM4N h2C9wLvzndL8+5jQCDdwvNMvLGDl930= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654604; h=from:from:reply-to: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=ez8WD5cRsRZqKCuv3LsW1Ei3OXKHBPi9iaji//6ZCPo=; b=yU6l7py6jlxadXEUsfKKXM3xLZRyb7oEr/+pnkL+tJbDo4kyaLnQ+Dil+MO25je/5VcIFa ieTYARTrLWSgZnDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C406413483; Tue, 13 Jun 2023 11:10:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sKb3LotOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:03 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Antonino Daplas Subject: [PATCH v3 24/38] fbdev/rivafb: Use hardware device as backlight parent Date: Tue, 13 Jun 2023 13:06:59 +0200 Message-ID: <20230613110953.24176-25-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586290008014757?= X-GMAIL-MSGID: =?utf-8?q?1768586290008014757?= Use the hardware device in struct fb_info.device as parent of the backlight device. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Cc: Antonino Daplas Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/riva/fbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c index e328b2d39e2b6..6ade8de5df4a0 100644 --- a/drivers/video/fbdev/riva/fbdev.c +++ b/drivers/video/fbdev/riva/fbdev.c @@ -333,7 +333,7 @@ static void riva_bl_init(struct riva_par *par) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = FB_BACKLIGHT_LEVELS - 1; - bd = backlight_device_register(name, info->dev, par, &riva_bl_ops, + bd = backlight_device_register(name, info->device, par, &riva_bl_ops, &props); if (IS_ERR(bd)) { info->bl_dev = NULL; From patchwork Tue Jun 13 11:07:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466743vqr; Tue, 13 Jun 2023 04:22:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6XbLG69e9JnE7/NubA0BQp45k9fWggbxfNAAAFD+vcMAX2lbvbgnA/Ge1kX6vJQAh2vK8/ X-Received: by 2002:a05:6358:c112:b0:12b:cdd6:9661 with SMTP id fh18-20020a056358c11200b0012bcdd69661mr4699561rwb.13.1686655346257; Tue, 13 Jun 2023 04:22:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655346; cv=none; d=google.com; s=arc-20160816; b=uaPrVkDwQd6VaSOv7YCH20VwOUNtE2nPJHZpwzKLSR2+16pltIWmdcgxZ0G6XrpHeD hn3vwrDnNplSPAcZi88Z+UedgNnUfUmRN9ecVacxbZyIRppJ0Vmpxqh9Guq9EIxnSf9P vfwXb1O8qjIIQDMkXvblfXUNSVWqfwC9z0AQwg/+S+F8EqwHKfNSZDx8z38l6nbmLtNZ wnjZExdRLFACyu1C3fYbGdNooWtrGRFBweXJIenjntBsoRS/X7w9K6tQ0VCQ0yFJmAOo mZuEdT86jRJfXUWbIu/SnRW19iWU5GKiDirFAqGqGf8Q1xc/FRJczRWhMX1Hhl6vtZfM 0TtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=m8VbrnHchcHPw1JwrzLB5Pq+lSXRLkyS7z7RtP8I5uQ=; b=iKUPTBTiHOGkPOzsdqxlPer3GsRgdB77Oq943XMxyqxMGqzC8BFvHH3hEazVOCfWEv Ac4e1ZN2ovn/MnmCBwsExSqZc1eR37IHEkflMhtmlOWmfp6YWx1y3x1d4i5BGEAL5hlS SFryR+M12bcwcJ2f9/SjxPt14HplMMFCr5VmyX6QaQlffriXLTB9y2ju7X8ERwaFK7Jd JhSKfs43ystsGJcXaRQs+YZUS5tL3ZyVfase4o1Yr75c+ohSW1ZGrWl0fH4PrS46KvhJ FWVFSE5+Fhd+Lu3Kat6Nb8y7V5VcMGQJVYJIGegvghPOBNek6XWiR7EpQbWvApEqE6sl CS8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=oYnRl8Ak; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=lJ2D1kHt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q22-20020a637516000000b00543ab2e61acsi5785562pgc.546.2023.06.13.04.22.14; Tue, 13 Jun 2023 04:22:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=oYnRl8Ak; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=lJ2D1kHt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242265AbjFMLLr (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242118AbjFMLKG (ORCPT ); Tue, 13 Jun 2023 07:10:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3B6410E3; Tue, 13 Jun 2023 04:10:05 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 667E41FDA0; Tue, 13 Jun 2023 11:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654604; h=from:from:reply-to: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=m8VbrnHchcHPw1JwrzLB5Pq+lSXRLkyS7z7RtP8I5uQ=; b=oYnRl8AkWCmENRcIzVUXhO4Wh5oMMp2WCbZyLVuUNoKCMD7t/NCDBe0yzRqLPcbBl/dz2m wa0dgoNHMkqrJSG8JEDzO95WePRNO/OdTM6gCRYTkeiRiAqDA+ZnBuQR0/tp82BY4vbH8j ubF00V9M7vPBV6O4aSxMi2a2wiksyP0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654604; h=from:from:reply-to: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=m8VbrnHchcHPw1JwrzLB5Pq+lSXRLkyS7z7RtP8I5uQ=; b=lJ2D1kHtpJp/O4D23HfdpfYnJIQb6xHWyHTSolcmFlo8ZcHmMipvk20u0Ulhz1PX9N4AmP qIIog4y/0K0u9hBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 1DC1513A47; Tue, 13 Jun 2023 11:10:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ALJlBoxOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:04 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 25/38] fbdev/sh7760fb: Use fb_dbg() in sh7760fb_get_color_info() Date: Tue, 13 Jun 2023 13:07:00 +0200 Message-ID: <20230613110953.24176-26-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586316514407439?= X-GMAIL-MSGID: =?utf-8?q?1768586316514407439?= Give struct fb_info to sh7760fb_get_color_info() and use it in call to fb_dbg(). Prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/sh7760fb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/sh7760fb.c b/drivers/video/fbdev/sh7760fb.c index 4c092c7935027..a2946f06d579e 100644 --- a/drivers/video/fbdev/sh7760fb.c +++ b/drivers/video/fbdev/sh7760fb.c @@ -118,7 +118,7 @@ static int sh7760_setcolreg (u_int regno, return 0; } -static int sh7760fb_get_color_info(struct device *dev, +static int sh7760fb_get_color_info(struct fb_info *info, u16 lddfr, int *bpp, int *gray) { int lbpp, lgray; @@ -150,7 +150,7 @@ static int sh7760fb_get_color_info(struct device *dev, lgray = 0; break; default: - dev_dbg(dev, "unsupported LDDFR bit depth.\n"); + fb_dbg(info, "unsupported LDDFR bit depth.\n"); return -EINVAL; } @@ -170,7 +170,7 @@ static int sh7760fb_check_var(struct fb_var_screeninfo *var, int ret, bpp; /* get color info from register value */ - ret = sh7760fb_get_color_info(info->dev, par->pd->lddfr, &bpp, NULL); + ret = sh7760fb_get_color_info(info, par->pd->lddfr, &bpp, NULL); if (ret) return ret; @@ -222,7 +222,7 @@ static int sh7760fb_set_par(struct fb_info *info) vdln = vm->yres; /* get color info from register value */ - ret = sh7760fb_get_color_info(info->dev, par->pd->lddfr, &bpp, &gray); + ret = sh7760fb_get_color_info(info, par->pd->lddfr, &bpp, &gray); if (ret) return ret; @@ -381,7 +381,7 @@ static int sh7760fb_alloc_mem(struct fb_info *info) return 0; /* get color info from register value */ - ret = sh7760fb_get_color_info(info->dev, par->pd->lddfr, &bpp, NULL); + ret = sh7760fb_get_color_info(info, par->pd->lddfr, &bpp, NULL); if (ret) { printk(KERN_ERR "colinfo\n"); return ret; From patchwork Tue Jun 13 11:07:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107290 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466270vqr; Tue, 13 Jun 2023 04:21:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6da+g51CtGFmcCkC26vDl2808XFh/Qg1IxmpIPkEBAYXCy4eu0YJE4W07NwHrQOTkEvhDY X-Received: by 2002:a17:902:e809:b0:1b0:10a1:3da9 with SMTP id u9-20020a170902e80900b001b010a13da9mr9982264plg.32.1686655292945; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655292; cv=none; d=google.com; s=arc-20160816; b=oamckpryhDeCR2Umhp+oO5gRtMWdJBH7+XUE9CpnMmUZ4cApIzC99voyxKzG9zVHmj vZkEB/ezYX+V6EkW76qwhJ/ERb//fcnoQeamlonTTy3+B/cM4VsKPZINNB/G1YlmsHt9 w+l7vAbWxNY4sbYGLKaoJFVUz59TyvI0d/EW5ZAxor1YDTobI2qe+aYZM1oLsKLRbe96 OpZRFRN6tRUy8bJXA5qp5u5N8Me/JVhb5mDe+xzofDsrqryxkBTETFkusCZpR/JPsheH erfL5VokAMCe8aA7NERF6iqPNvM4STDKK0/u15kAlHMcGgSCuvuFe/447wlTIAbeI9+b 507Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=guIJoWJMSuzJv25ve1TkcJf7H3PXNPA3ImIuH3/xvww=; b=rVsgm1VlpEc1N5oj3ns0aM8wXw99e/JQlQxU3jvH2uUii5mXKPMJaNNSX0FlrwrElB cYHgNvdGJZARiuCzx1CZpH3/D4o66fEYgmlpcpkUoMmNFInhUhcfAlIoZZRXGeDp1pSr deC+Xq/Nmo/XoH2Itc6o0C4/NNxlaJVB0R+/KFCWziqn91xS/j1ZkP7EGyFgZavxxkM0 Xf25YinHGSKYPC7LNY3P2nRCumeFkGMNWo5nHKB1PvuuW2CwdWGP2SINcLPjulh/8eay uzPixKSn6eMJLONEqD8sKV0AHavfSAlHg1zdCnv8NILQxB0s87ZIX4FibKESIHWEz/53 JWTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hj50Iq3V; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z18-20020a170903019200b001ab089f7329si5640701plg.73.2023.06.13.04.21.20; Tue, 13 Jun 2023 04:21:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hj50Iq3V; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242294AbjFMLMC (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242120AbjFMLKG (ORCPT ); Tue, 13 Jun 2023 07:10:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03805E52; Tue, 13 Jun 2023 04:10:06 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B6D5E1FDA4; Tue, 13 Jun 2023 11:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654604; h=from:from:reply-to: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=guIJoWJMSuzJv25ve1TkcJf7H3PXNPA3ImIuH3/xvww=; b=hj50Iq3V4x/70hCviEOq3FpS7Jn1QAZQteUUa/48pT+K0XTZ4o4EqEAKktP2N1fI1m+1K1 VATTZL0fsHpyLcBWcUS0D4oZWH2jeCd1p/uM9NxQb68qa5Ev7eXRS4qFZXausvDFuNCkMe YAEnG3zUFPOr1OTPr5EAal+LLbxJ1Sk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654604; h=from:from:reply-to: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=guIJoWJMSuzJv25ve1TkcJf7H3PXNPA3ImIuH3/xvww=; b=MyE+KQK5t7ZSZOGL+3gXBppHNkc1W7hY/84eUuj+bAevq47DAIDRK2DvgQP1lBqBAfZlwh JwQcvO/pIWYXKfDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6A28213483; Tue, 13 Jun 2023 11:10:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CLYAGYxOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:04 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 26/38] fbdev/sh7760fb: Output messages with fb_dbg() Date: Tue, 13 Jun 2023 13:07:01 +0200 Message-ID: <20230613110953.24176-27-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586260229174545?= X-GMAIL-MSGID: =?utf-8?q?1768586260229174545?= Fix cases were output helpers are called with struct fb_info.dev. Use fb_dbg() instead. Prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/sh7760fb.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/sh7760fb.c b/drivers/video/fbdev/sh7760fb.c index a2946f06d579e..65e2c71cf5b51 100644 --- a/drivers/video/fbdev/sh7760fb.c +++ b/drivers/video/fbdev/sh7760fb.c @@ -207,7 +207,7 @@ static int sh7760fb_set_par(struct fb_info *info) /* rotate only works with xres <= 320 */ if (par->rot && (vm->xres > 320)) { - dev_dbg(info->dev, "rotation disabled due to display size\n"); + fb_dbg(info, "rotation disabled due to display size\n"); par->rot = 0; } @@ -226,7 +226,7 @@ static int sh7760fb_set_par(struct fb_info *info) if (ret) return ret; - dev_dbg(info->dev, "%dx%d %dbpp %s (orientation %s)\n", hdcn, + fb_dbg(info, "%dx%d %dbpp %s (orientation %s)\n", hdcn, vdln, bpp, gray ? "grayscale" : "color", par->rot ? "rotated" : "normal"); @@ -306,7 +306,7 @@ static int sh7760fb_set_par(struct fb_info *info) if (((ldmtr & 0x003f) >= LDMTR_DSTN_MONO_8) && ((ldmtr & 0x003f) <= LDMTR_DSTN_COLOR_16)) { - dev_dbg(info->dev, " ***** DSTN untested! *****\n"); + fb_dbg(info, " ***** DSTN untested! *****\n"); dstn_off = stride; if (par->rot) @@ -326,17 +326,17 @@ static int sh7760fb_set_par(struct fb_info *info) sh7760fb_blank(FB_BLANK_UNBLANK, info); /* panel on! */ - dev_dbg(info->dev, "hdcn : %6d htcn : %6d\n", hdcn, htcn); - dev_dbg(info->dev, "hsynw : %6d hsynp : %6d\n", hsynw, hsynp); - dev_dbg(info->dev, "vdln : %6d vtln : %6d\n", vdln, vtln); - dev_dbg(info->dev, "vsynw : %6d vsynp : %6d\n", vsynw, vsynp); - dev_dbg(info->dev, "clksrc: %6d clkdiv: %6d\n", + fb_dbg(info, "hdcn : %6d htcn : %6d\n", hdcn, htcn); + fb_dbg(info, "hsynw : %6d hsynp : %6d\n", hsynw, hsynp); + fb_dbg(info, "vdln : %6d vtln : %6d\n", vdln, vtln); + fb_dbg(info, "vsynw : %6d vsynp : %6d\n", vsynw, vsynp); + fb_dbg(info, "clksrc: %6d clkdiv: %6d\n", (par->pd->ldickr >> 12) & 3, par->pd->ldickr & 0x1f); - dev_dbg(info->dev, "ldpmmr: 0x%04x ldpspr: 0x%04x\n", par->pd->ldpmmr, + fb_dbg(info, "ldpmmr: 0x%04x ldpspr: 0x%04x\n", par->pd->ldpmmr, par->pd->ldpspr); - dev_dbg(info->dev, "ldmtr : 0x%04x lddfr : 0x%04x\n", ldmtr, lddfr); - dev_dbg(info->dev, "ldlaor: %ld\n", stride); - dev_dbg(info->dev, "ldsaru: 0x%08lx ldsarl: 0x%08lx\n", sbase, ldsarl); + fb_dbg(info, "ldmtr : 0x%04x lddfr : 0x%04x\n", ldmtr, lddfr); + fb_dbg(info, "ldlaor: %ld\n", stride); + fb_dbg(info, "ldsaru: 0x%08lx ldsarl: 0x%08lx\n", sbase, ldsarl); return 0; } @@ -401,7 +401,7 @@ static int sh7760fb_alloc_mem(struct fb_info *info) } else if (bpp > 8) vram *= 2; if ((vram < 1) || (vram > 1024 * 2048)) { - dev_dbg(info->dev, "too much VRAM required. Check settings\n"); + fb_dbg(info, "too much VRAM required. Check settings\n"); return -ENODEV; } From patchwork Tue Jun 13 11:07:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107308 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp467019vqr; Tue, 13 Jun 2023 04:22:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xi8cZefpmg26jcuI9MOn7Qu+b8RFYa0uvp0XNjeT6aPdOcwZ3bFeYJ/955GUbSXMA3C7y X-Received: by 2002:a05:6359:2ea3:b0:128:f718:32d1 with SMTP id rp35-20020a0563592ea300b00128f71832d1mr5457053rwb.18.1686655374031; Tue, 13 Jun 2023 04:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655373; cv=none; d=google.com; s=arc-20160816; b=oqQuDttYNhOTP00dcPlXxqLhjre5N1zYJtFbHs6ZyXApwEA1soBIdte/IHfwbYpK5M qv5IGvh2drUnOqbjVHHu5TyCx3ekfhE6IGVDOi7510mPCIzPq9et5EYVm1w7UHdL/VS3 WBiB7iX+Tws9L4IjadJOWE3qqiCj5MdPMWZXhSOoQxgHR85pPWTK4l0VPVrxTm7HqgoJ +a9/nUsh2RD8hx2jG8brovfKkt3gk3xzyfG1rPuR+2DBZk1IJH4WJiEzAjVCH8EojHW/ GQyGDvGx1CNT8QXG8BnQO46iCf2IzVIbueU9Dla6V1mzu9XYwYz0T6/3aZ2JyY4koFTT pFjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=XZq7uuC2nsDif+K+IT1h1suAjzRhQ7TghVnMjkbiuGw=; b=KXpBZsut3glkqSH1hcEI8TKsP2KSmWUZeEbPFzc1UrGjogXJFLrxiJ0c0vgImKIDlu l3/T2dwSIGWowPW/+QXn8Co38C/lxPWXSANi6hADkEjLpH94vcVUcdNekqORzITrFhzf 8lylUjtY38dyKYqQPEl5wZQ9XbJXgwJMQi02LANM5lnDjC8jqQB3EdOtWfI2MHukXBI4 qTz19NjgaamtZ2Go8WT61EYLRhnnHqKhge/fhyn8OF5Dr/EARFWZL8PkpuOJDpvLQsZ6 XES89if8cyXFZ6E4OOBj3crqmBcdKjbey9lrOTSZosozXqdKySrW5IsuqmmV8LH3+Df6 VpGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=wMI4M08z; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=9lBBsdpC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t190-20020a6381c7000000b00542ad9945f2si8559354pgd.647.2023.06.13.04.22.40; Tue, 13 Jun 2023 04:22:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=wMI4M08z; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=9lBBsdpC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242232AbjFMLL7 (ORCPT + 99 others); Tue, 13 Jun 2023 07:11:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242121AbjFMLKH (ORCPT ); Tue, 13 Jun 2023 07:10:07 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EC5A10D8; Tue, 13 Jun 2023 04:10:06 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1243A22433; Tue, 13 Jun 2023 11:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654605; h=from:from:reply-to: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=XZq7uuC2nsDif+K+IT1h1suAjzRhQ7TghVnMjkbiuGw=; b=wMI4M08z+h8WOHtDR4vdZ1pZcc6xE415PsiqLphJyVJk0ALCidw6yjDGajMIpea5QXw3el LbruFCKCJmg28Y706Qpr9KCrkLU1xsuOUsMXVl6/yKOe6dtKS81+9QIGA4bZX4uoKjt/bG ixmn2BHImoFXWzNwWr0CXxmn16NouLo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654605; h=from:from:reply-to: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=XZq7uuC2nsDif+K+IT1h1suAjzRhQ7TghVnMjkbiuGw=; b=9lBBsdpC1od6KX4bQ1V3b7E05G7pp1oYKu/NxM/3FUvJPxlP9L1hcIWo4LmJEu7XXmiUPh qoC49pEJGgBA7jCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BA50313A47; Tue, 13 Jun 2023 11:10:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YOKaLIxOiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:04 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 27/38] fbdev/sh7760fb: Alloc DMA memory from hardware device Date: Tue, 13 Jun 2023 13:07:02 +0200 Message-ID: <20230613110953.24176-28-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586345345280276?= X-GMAIL-MSGID: =?utf-8?q?1768586345345280276?= Pass the hardware device to the DMA helpers dma_alloc_coherent() and dma_free_coherent(). The fbdev device that is currently being used is a software device and does not provide DMA memory. Also update the related dev_*() output statements similarly. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas --- drivers/video/fbdev/sh7760fb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/sh7760fb.c b/drivers/video/fbdev/sh7760fb.c index 65e2c71cf5b51..74543a1e30314 100644 --- a/drivers/video/fbdev/sh7760fb.c +++ b/drivers/video/fbdev/sh7760fb.c @@ -359,7 +359,7 @@ static void sh7760fb_free_mem(struct fb_info *info) if (!info->screen_base) return; - dma_free_coherent(info->dev, info->screen_size, + dma_free_coherent(info->device, info->screen_size, info->screen_base, par->fbdma); par->fbdma = 0; @@ -408,14 +408,14 @@ static int sh7760fb_alloc_mem(struct fb_info *info) if (vram < PAGE_SIZE) vram = PAGE_SIZE; - fbmem = dma_alloc_coherent(info->dev, vram, &par->fbdma, GFP_KERNEL); + fbmem = dma_alloc_coherent(info->device, vram, &par->fbdma, GFP_KERNEL); if (!fbmem) return -ENOMEM; if ((par->fbdma & SH7760FB_DMA_MASK) != SH7760FB_DMA_MASK) { sh7760fb_free_mem(info); - dev_err(info->dev, "kernel gave me memory at 0x%08lx, which is" + dev_err(info->device, "kernel gave me memory at 0x%08lx, which is" "unusable for the LCDC\n", (unsigned long)par->fbdma); return -ENOMEM; } @@ -486,7 +486,7 @@ static int sh7760fb_probe(struct platform_device *pdev) ret = sh7760fb_alloc_mem(info); if (ret) { - dev_dbg(info->dev, "framebuffer memory allocation failed!\n"); + dev_dbg(info->device, "framebuffer memory allocation failed!\n"); goto out_unmap; } From patchwork Tue Jun 13 11:07:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466313vqr; Tue, 13 Jun 2023 04:21:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Zn7mOL3zkByG1FuncKg7ZyCRtReCm/w5lT/Oj7m+Tdlv+/cxi/3RiVH5G7rn4ynZfr9Vy X-Received: by 2002:a05:6808:8c:b0:39a:bbd4:bab with SMTP id s12-20020a056808008c00b0039abbd40babmr7400805oic.31.1686655296842; Tue, 13 Jun 2023 04:21:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655296; cv=none; d=google.com; s=arc-20160816; b=mzo7vt9/48bjlWALDpZOBN9GervwullQicLoFCtU1nJMDgcVhCHSy4ZVVbcnTg4X08 RZQ9MAbxJ12wttdhujM66EhVDxmKeOew78dt3AdWS9HnC8wEX/uzGyWqR/A/klU4Jdby GSnRh7i4Dziyw/vXAZ506KNQETP8AF1f62g8HVk0eiT9b2RuY1zHTprrwz5xx/hiyGV8 f+3O5P1PFwd2xSSxcVcdI5tgL0S+rpo16DrxRkymPynRULj/3RJwO6r1tlMfE/Vgz5Yy 1ADhBAiFMBrray9XCOhbicHrw+MWa1zFaAfQqoeAk2tUoyY7R8+9Txgfvxm2cgnKyRif SWOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=x+Pej+DjtuslhRkqSbqykfmY3R1IGvKyLMb1wCzPsnA=; b=wol4f9ksDSP8ogxbVT3W+2075qSp+UkCuSbvQ0P1qOnop1yez06YkhRpxxjRavZC4a OaRuTZbDQbN4rGrroaveavhZJLfymk6CDgAkixmDghs6qS3alKU3BWPVopIVIBUv4MJz D9TTLm3RA3M8Jf1Erd8Lx11pj3cKau4oGKClYuKh2MnRQp/HnPVmEOWd051ARVEZWQP/ WVdQKOMd6/RGSLgSNoAqVUHXM9es7+MTl5QHqzA5U45UOt10WhZF6KpIGtyUI7NALAWT 6Ih2kI0irDhuYo5Ie6ikkhzQutK6wbef1JYt2ZQvEPrrYox4cNmPZrDNy3kFzjGROkOK xhcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="DPCy6m3/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=9z2qqSYJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id my17-20020a17090b4c9100b00258996c09e4si10738871pjb.22.2023.06.13.04.21.24; Tue, 13 Jun 2023 04:21:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="DPCy6m3/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=9z2qqSYJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242207AbjFMLMI (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242124AbjFMLKH (ORCPT ); Tue, 13 Jun 2023 07:10:07 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A851992; Tue, 13 Jun 2023 04:10:06 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 619461FDA7; Tue, 13 Jun 2023 11:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654605; h=from:from:reply-to: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=x+Pej+DjtuslhRkqSbqykfmY3R1IGvKyLMb1wCzPsnA=; b=DPCy6m3/VoljsI4nL85OtZJkvAEjkY7VIh384polvAzdZI0R/H09cLfHmiysnYAztjsd7Q 7Nu15mdsj95TGchL3ik5Il/vUYWQT83VTNjDA3Yy1BTOKxdO15IPDGwBSBwjyIo13XxjSC 5vCy8hCHueof/0WuJ0szfScdyOn/rpw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654605; h=from:from:reply-to: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=x+Pej+DjtuslhRkqSbqykfmY3R1IGvKyLMb1wCzPsnA=; b=9z2qqSYJdYO4whOJ9l9oFrTLJwBXOJqfq4+4rtK6NiiIkNufrM06d5VbAmrFmjZ3tEjz5q JcuK6R3S2IrIDnAQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 15F0E13483; Tue, 13 Jun 2023 11:10:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cOCCBI1OiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:05 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 28/38] fbdev/sh7760fb: Use hardware device with dev_() output during probe Date: Tue, 13 Jun 2023 13:07:03 +0200 Message-ID: <20230613110953.24176-29-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586264419269850?= X-GMAIL-MSGID: =?utf-8?q?1768586264419269850?= Call output helpers in the probe function with the hardware device. The virtual fbdev device has not been initialized at that point. Also prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/sh7760fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/sh7760fb.c b/drivers/video/fbdev/sh7760fb.c index 74543a1e30314..8566bcd664076 100644 --- a/drivers/video/fbdev/sh7760fb.c +++ b/drivers/video/fbdev/sh7760fb.c @@ -450,7 +450,7 @@ static int sh7760fb_probe(struct platform_device *pdev) par->pd = pdev->dev.platform_data; if (!par->pd) { - dev_dbg(info->dev, "no display setup data!\n"); + dev_dbg(&pdev->dev, "no display setup data!\n"); ret = -ENODEV; goto out_fb; } @@ -519,13 +519,13 @@ static int sh7760fb_probe(struct platform_device *pdev) ret = fb_alloc_cmap(&info->cmap, 256, 0); if (ret) { - dev_dbg(info->dev, "Unable to allocate cmap memory\n"); + dev_dbg(&pdev->dev, "Unable to allocate cmap memory\n"); goto out_mem; } ret = register_framebuffer(info); if (ret < 0) { - dev_dbg(info->dev, "cannot register fb!\n"); + dev_dbg(&pdev->dev, "cannot register fb!\n"); goto out_cmap; } platform_set_drvdata(pdev, info); From patchwork Tue Jun 13 11:07:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107296 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466516vqr; Tue, 13 Jun 2023 04:21:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ijLizlgkkJ0pvkpzT1bO2Af8K/eHK1fk0LFmBd4adzXDVzLBNnOOSVcaDsJdpqvgv6uvL X-Received: by 2002:a05:6a20:3caa:b0:105:66d3:8572 with SMTP id b42-20020a056a203caa00b0010566d38572mr14849716pzj.24.1686655316671; Tue, 13 Jun 2023 04:21:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655316; cv=none; d=google.com; s=arc-20160816; b=gbm8IzlzXlAsgQsyY71LomAW4CdkGN822QApC+Uz/YH6mX1B8G6a2QObvKJFKH/GW0 YvqX5Jw3BnGtbwyxznxML5EU59wXfyXjuOiRsJfFYfGFUVSelFUdzWt0LjjxIeE/ipgo HYofjf0mi4NUFke41P/zmMa+JSyUvuRb2Slx26w47GlFEVzk8bJKuAhnxUmcjOrBHi7J w+9y6UPjC/R3fy2lVLdP32/XRptaT6oJcUxRXMWHZIBpo9/hJ9Wy43v6tBmyeIvZy7+V b1SVatGALsB5lF4qaq5lwf0lEub0le7cPZT8TWZ7ZcZKqlMSONA9e/JbxCyte2sbRyal y9wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=I1lXhCwwkTluotNxM94JUDxkMaSVza26KonrPaNCMCs=; b=zcwhJF2SqePynFMXBAKW512WxBwyIr3UUOYNv3VrL/tTrW2JDmM5rT4W5JfeqCNju+ 5DWD1SZM3uldVl6386LxMdwLO1wZSPj3byvtlyc5dF1/o8mn6J7jx9SsEN/HujbnbtpP SxDWuMrWj0dw/qs8RJFpqUb+KBfX9KAglEbcyqfPxoo85Q9qNARe0t3DXdDbQFaipczr MMUZmD54f9mmmt1UdL5gsDvMAFWf13T6vVlbl8RpbX6z+qcvxCPhHM5kkMuySNNZIVh1 /mMIVgTTRGzeUWgXs8f41uuVeiqS3ZQjLb3TQzCXJlVcXd7wkQwZLEdILRd0igZ9m7wv RO4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=GMcTHgMF; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 207-20020a6218d8000000b0064580409a12si8245805pfy.320.2023.06.13.04.21.44; Tue, 13 Jun 2023 04:21:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=GMcTHgMF; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238726AbjFMLMF (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242125AbjFMLKI (ORCPT ); Tue, 13 Jun 2023 07:10:08 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BFE210DA; Tue, 13 Jun 2023 04:10:07 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B10071FDA3; Tue, 13 Jun 2023 11:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654605; h=from:from:reply-to: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=I1lXhCwwkTluotNxM94JUDxkMaSVza26KonrPaNCMCs=; b=GMcTHgMFSY0lkdtn1OuBxN2h39OQkf3vKKkENDf+V+lv0LmjfUAFdoPLd7TKQ1fECZF3ga EA2ID4NfY8BmqNZlVc42cYUptJ3l4VWIVTQbwEgFzJJvRB7K/f2MG7VDlayYhrV8RXTJTY 3Cq5AZ3hxM+cAJRx1XGdbxkzxvmV1lg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654605; h=from:from:reply-to: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=I1lXhCwwkTluotNxM94JUDxkMaSVza26KonrPaNCMCs=; b=pE5AqeVLpcdriEJL4QjDO0oXfyrjQPf9TigLjq6p7XgwzYRBj5j5907OWGmeAyDqYaPx4l TnsLlLaeP1BGYxBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6531B13A47; Tue, 13 Jun 2023 11:10:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cAbbF41OiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:05 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 29/38] fbdev/sm501fb: Output message with fb_err() Date: Tue, 13 Jun 2023 13:07:04 +0200 Message-ID: <20230613110953.24176-30-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586285394544832?= X-GMAIL-MSGID: =?utf-8?q?1768586285394544832?= Fix case were dev_err() is being called with struct fb_info.dev. Use fb_err() instead. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/sm501fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c index e0d29be1565bb..46951a0952741 100644 --- a/drivers/video/fbdev/sm501fb.c +++ b/drivers/video/fbdev/sm501fb.c @@ -1293,7 +1293,7 @@ static int sm501fb_sync(struct fb_info *info) count--; if (count <= 0) { - dev_err(info->dev, "Timeout waiting for 2d engine sync\n"); + fb_err(info, "Timeout waiting for 2d engine sync\n"); return 1; } return 0; From patchwork Tue Jun 13 11:07:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466540vqr; Tue, 13 Jun 2023 04:22:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ636jD5e/0cGY0OeNS7QpGDl4RBuzN2fAq4UYXzhxQEcnVK9cuTPQg8SomPCaoj6BFDjiGk X-Received: by 2002:a17:90b:3b51:b0:259:82e:c1d1 with SMTP id ot17-20020a17090b3b5100b00259082ec1d1mr11044783pjb.34.1686655320066; Tue, 13 Jun 2023 04:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655320; cv=none; d=google.com; s=arc-20160816; b=YJ8Sv3KZTKsscJ+4qSMQApckwraFg3K5AJgQYBMuEcQzbXwM/r15/UEbUKHdkTy0eG hG+0ggFUgeGJo4UPkQzJmPgiES/yhIwMuRcetigsFWAKXk6OTm9IdsrLEgSj0jUIKrlV U0aOQLSdSfVzHmI/YKIyZR1NY4O3ZM0A5GWqmHBAs4qtGJyRdvu4lhK6lU5nsN4yfTPw zRvWyZdMcw6PTcFF5TCBzcNF5Pgmd15P4BWcU6tFNO8ivLOKBApV99PXyY/qm3AHuU5h KsE5dRxuaC5hb4SwlnX0gewuJIZLShJIH0fA1FB5I6FhABfsyFjhlo7hPe0WzWwc36Et GYhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=1BuztNQSgsuQs3xHFrmB515HWtrc7sc9NpbsuatwBeo=; b=HF2OAEl4yUcwZkYvTZA7W7QPK841KXYnnM8LvdqIuha6OyAWuFtvUN8yj3X+8iJVFM 4ERJLV0vLzJZwYfOuq20O+ugXkTIEM06/trvUrUVW1tk5YYoyv6aX8SHBVgYCghejcq1 pzyCJg3SpTPIcClcmNBR2H6bOLEjNfzA2ITVNtp2NIno+RWH6fBNwvazkN3JCzBB2EXh 1TIWLGiJCCQW6ALhkCk0GphkPvlLn16ObV0ZoG/aSTt3abYoZefGZf16cVo3UVTr2UCJ IxmMSM4Hm9M/ZVsekgcJj/5ORmvNNZdh44g+csFtMaf0UCG0dgT1iTxS+DbYTYj7KsMY HXOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=xYlSFG6C; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=MjJP+zQH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a17090ac38500b0025bcbc20b9esi4445991pjt.74.2023.06.13.04.21.48; Tue, 13 Jun 2023 04:22:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=xYlSFG6C; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=MjJP+zQH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242317AbjFMLMZ (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242127AbjFMLKI (ORCPT ); Tue, 13 Jun 2023 07:10:08 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65E8010DE; Tue, 13 Jun 2023 04:10:07 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0EF4B1FDAC; Tue, 13 Jun 2023 11:10:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654606; h=from:from:reply-to: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=1BuztNQSgsuQs3xHFrmB515HWtrc7sc9NpbsuatwBeo=; b=xYlSFG6CqucP0AReBtnHoo9yOCqWmGRx8GiCt5Gl58QihD8IuNDmW8CKS8A31iXb6fJ0RS eA04EwkVntJVCWq1v5ccReJin3qLpPO5q9lbtp6VsRnJL5aYmpQmAFAaF1BSYIXPB3fcru z/js7oMGW+T8ByW/8u7MYj6rNxOsmmA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654606; h=from:from:reply-to: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=1BuztNQSgsuQs3xHFrmB515HWtrc7sc9NpbsuatwBeo=; b=MjJP+zQHwfGIHEIKvXvJwGD1mOWq2Pl3tjwOzzD3olGhg/J6xuIu2PdQewP/5i/xU66Izm X35Ljej+qj7Kg5Bg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B1E4513483; Tue, 13 Jun 2023 11:10:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id aJ+qKo1OiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:05 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , Steve Glendinning Subject: [PATCH v3 30/38] fbdev/smscufx: Detect registered fb_info from refcount Date: Tue, 13 Jun 2023 13:07:05 +0200 Message-ID: <20230613110953.24176-31-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586288392865034?= X-GMAIL-MSGID: =?utf-8?q?1768586288392865034?= Detect registered instances of fb_info by reading the reference counter from struct fb_info.read. Avoids looking at the dev field and prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Cc: Steve Glendinning Reviewed-by: Javier Martinez Canillas --- drivers/video/fbdev/smscufx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c index 17cec62cc65db..adb2b1fe8383c 100644 --- a/drivers/video/fbdev/smscufx.c +++ b/drivers/video/fbdev/smscufx.c @@ -1496,7 +1496,7 @@ static int ufx_setup_modes(struct ufx_data *dev, struct fb_info *info, u8 *edid; int i, result = 0, tries = 3; - if (info->dev) /* only use mutex if info has been registered */ + if (refcount_read(&info->count)) /* only use mutex if info has been registered */ mutex_lock(&info->lock); edid = kmalloc(EDID_LENGTH, GFP_KERNEL); @@ -1610,7 +1610,7 @@ static int ufx_setup_modes(struct ufx_data *dev, struct fb_info *info, if (edid && (dev->edid != edid)) kfree(edid); - if (info->dev) + if (refcount_read(&info->count)) mutex_unlock(&info->lock); return result; From patchwork Tue Jun 13 11:07:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107294 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466326vqr; Tue, 13 Jun 2023 04:21:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QdKM3/HenVPVySL04lDK8Ba2zc8dtFL7lC7mSuJLBvJxDqw3Bs1Mk6BocyHUsFTzuAJdP X-Received: by 2002:a05:6808:de5:b0:396:11b3:5851 with SMTP id g37-20020a0568080de500b0039611b35851mr6317768oic.54.1686655298062; Tue, 13 Jun 2023 04:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655298; cv=none; d=google.com; s=arc-20160816; b=S8Y+c62Lb0emO32hBLo1IcaJv3ZSPAi6zjuFQev6FO1ieEaYpksincVG6CAF97xMFy gzbmqGdwlMD78ocyoe7JWT+Xc6Yqt1tzT48P9ijtUs2ftFcfBgoTRnODrz6sfcZxHd6L g6FIm3FxPVE4e0IK0MwF6PX3XlPVJD6Rtgyz7YKiccFiFov8jIkZvCoyi04DlquMvYVG MxKfzVKO9hULZlXTS7EUYkq8ydrE7oqTVyiK0fyAVI3Pj8XBrvP4H6KUuKbhCBgEia9F 0MGnQAplBlakBW5iaP5NbJU+9xkvQSvaLFBIqOI42N/zU0WVPNe5f2oFzS3aVsxWJi5+ Uezg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ZfSP1y1Od3RE4xLQhOI7CNFh+UziWmakxVkeObt75SY=; b=iHSCyRJv7XT9QTUDAUeccwokcwsaP4pL3WcewWANm8b2tRQvav9CSGFICfGeYAsBU5 qNfdpqii0ZYhIdHmtMTQdCHsAQiQwwucxEmorD0/Fgzva3ku/UqAtznGSR47FjE6ssA+ 4G9x8mOlSfxnGLVIaHku2F2F+ViSBURON6V0jxBmBZyHbx5XXpZrjCv7KSEDq+U74X5m 71Jan+B2QGUj92QzbyzDOJC29BYI5uLN7cUWi2zfNssnvxRZqEU0SPyYwK+2x/Oal6oE EYlftrtT1yKq91U6W/YBT4t89rnb/aNaMzp7qpIPpxk/nQzLEt6WjN93UQbpa0FAvGUs ZE7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=BVN87CZX; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 21-20020a17090a001500b002479bbf3246si10423886pja.124.2023.06.13.04.21.25; Tue, 13 Jun 2023 04:21:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=BVN87CZX; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242246AbjFMLMU (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242129AbjFMLKJ (ORCPT ); Tue, 13 Jun 2023 07:10:09 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE142E52; Tue, 13 Jun 2023 04:10:07 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6150D1FD9F; Tue, 13 Jun 2023 11:10:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654606; h=from:from:reply-to: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=ZfSP1y1Od3RE4xLQhOI7CNFh+UziWmakxVkeObt75SY=; b=BVN87CZX9PNwGlsQxUaCox0+gvzO4rs20m57EzzvMA3gw9SxzIvRBlJ2oKdFb5ad9VVTHG gQ3INMSWM/s7jt8VLQ68rYPvcS6A4wz7gG1G9gvoVpCN4f1Kw5dm9MXSP0jsFwNNsOus9Y iTs1M+VcjWanbcwEuWLIpLOwJ9c1nzA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654606; h=from:from:reply-to: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=ZfSP1y1Od3RE4xLQhOI7CNFh+UziWmakxVkeObt75SY=; b=lUIKTf5P2HghJ44B8ZTHw6QKEDgmMbMZhXzFHEdO0leLki1QSlYc7AS6dgC+mNlSz0ZwAE GLeHPozBRF6zjGDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 132E713A47; Tue, 13 Jun 2023 11:10:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eOmpA45OiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:06 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 31/38] fbdev/tdfxfb: Set i2c adapter parent to hardware device Date: Tue, 13 Jun 2023 13:07:06 +0200 Message-ID: <20230613110953.24176-32-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586265599477045?= X-GMAIL-MSGID: =?utf-8?q?1768586265599477045?= Use the 3dfx hardware device from the Linux device hierarchy as parent device of the i2c adapter. Aligns the driver with the rest of the codebase and prepares fbdev for making struct fb_info.dev optional. Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/tdfxfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/tdfxfb.c b/drivers/video/fbdev/tdfxfb.c index cdf8e9fe99487..dd0fa42eceb9b 100644 --- a/drivers/video/fbdev/tdfxfb.c +++ b/drivers/video/fbdev/tdfxfb.c @@ -1327,8 +1327,8 @@ static void tdfxfb_create_i2c_busses(struct fb_info *info) par->chan[0].par = par; par->chan[1].par = par; - tdfxfb_setup_ddc_bus(&par->chan[0], "Voodoo3-DDC", info->dev); - tdfxfb_setup_i2c_bus(&par->chan[1], "Voodoo3-I2C", info->dev); + tdfxfb_setup_ddc_bus(&par->chan[0], "Voodoo3-DDC", info->device); + tdfxfb_setup_i2c_bus(&par->chan[1], "Voodoo3-I2C", info->device); } static void tdfxfb_delete_i2c_busses(struct tdfx_par *par) From patchwork Tue Jun 13 11:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp466417vqr; Tue, 13 Jun 2023 04:21:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7/DBwbKsy2xh6+FSUtqy5zLyTXbdIQUP36xwbslEO19AqMabxx0yOIjZKu7nU9u7L5i/SU X-Received: by 2002:a05:6a20:1443:b0:10d:d42:f6bc with SMTP id a3-20020a056a20144300b0010d0d42f6bcmr14114104pzi.41.1686655307763; Tue, 13 Jun 2023 04:21:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686655307; cv=none; d=google.com; s=arc-20160816; b=s0u8lCnaPHhQBtXmEjYBVshb8Vii/cuOGfH7M84U/aXL1sLbSDvHJ8Zw7O8G3ExWNn w2dJeZ1tzVdYlx8btRwbOOvNE0bjwAGXZv8ebXKE0iN3YF+KnwfTMlYfV3HHlvxpFAg5 ZbSJ3H816LWLNDInb06ZAEosx9XphSZ+79bIjwryeBCnW47amSgGxEJHS+QM6/OJCDAU F//zwCVq5sKhvvbAaArjgJw5G48mz9RmjggMp0PJhiIbzDQWM+d1DwJvvtevZXSvcmoN 92hS10NbEhVlVl5bFlKEiG9jd8brVXz8lEK7gT4he/iOzrE67v436a+AQaHa8z6D/wqi 44Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=0tu/JKMGLiCEE+vfj8wBgGdw9lM3UZPxyBeIhMkARs8=; b=wayn5143wwZEZFyus9/fcatGbrckxnENFF97ZobddazF5LzC1iSd5qccNkD9DaP4h+ Uk92sI7jy6xUXo/DhegTAwSqcIVld9VPTRGa8j9AcLkIVBYml+1IdgynnyEjq9LHRtkc R8QzbgRumApYhNYP6WyzrbHt0CfAE8zJQRm5kQx0lZvNN9J4rCsmuAKHV8VhpCzRkEpP su/FwBYXBiPX3vnt1M6YtARcKNKmih3byufHPyKBBsfbc+vVj/HDRLyfvIaUo220Qfzf FHu3dpEsaU0fX+ecDHqMZCKf2ud1anc+kOPxmcWpMYuGFuEK6QRV8r4QmZX1Lq2OSgNY Yh2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=gD3RqIR7; dkim=neutral (no key) header.i=@suse.de header.b=z6aeGbLJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y7-20020aa793c7000000b0064d533abfd4si8483794pff.189.2023.06.13.04.21.35; Tue, 13 Jun 2023 04:21:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=gD3RqIR7; dkim=neutral (no key) header.i=@suse.de header.b=z6aeGbLJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242242AbjFMLMP (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242130AbjFMLKJ (ORCPT ); Tue, 13 Jun 2023 07:10:09 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EC8110D8; Tue, 13 Jun 2023 04:10:08 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id BC3301FD96; Tue, 13 Jun 2023 11:10:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654606; h=from:from:reply-to: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=0tu/JKMGLiCEE+vfj8wBgGdw9lM3UZPxyBeIhMkARs8=; b=gD3RqIR7LLgIJf/raJmnBp1/fN4KnZuvNPMCPbw84+ze/hp19d9utOK8qOyPy48VnIqnDm p4Q/O2MXj8GyfgEjzadd79h+eAyWFH+jnuF/maAGpA9qzaSZIma9pBPfZcp7HKxEmaRi2M 1YTy9q+B1aMBsXoMOOgREw3yxIRcG/8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654606; h=from:from:reply-to: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=0tu/JKMGLiCEE+vfj8wBgGdw9lM3UZPxyBeIhMkARs8=; b=z6aeGbLJOcZkJ9fjFl/1u2Rjidi8dpSypWpN8+ijK0Z9nQzVcNkG20vHx1S9jFFMEHHvCA JokW7PBXxayELLCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 657E213483; Tue, 13 Jun 2023 11:10:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0ITtF45OiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:06 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann , "Rafael J. Wysocki" , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH v3 32/38] fbdev/core: Pass Linux device to pm_vt_switch_*() functions Date: Tue, 13 Jun 2023 13:07:07 +0200 Message-ID: <20230613110953.24176-33-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768586275868976538?= X-GMAIL-MSGID: =?utf-8?q?1768586275868976538?= Pass the Linux device to pm_vt_switch_*() instead of the virtual fbdev device. Prepares fbdev for making struct fb_info.dev optional. The type of device that is passed to the PM functions does not matter much. It is only a token within the internal list of known devices. The PM functions do not refer to any of the device's properties or its type. Signed-off-by: Thomas Zimmermann Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: linux-pm@vger.kernel.org Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/core/fbmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 329d16e49a900..f91ae7d4c94d6 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1478,9 +1478,9 @@ static int do_register_framebuffer(struct fb_info *fb_info) INIT_LIST_HEAD(&fb_info->modelist); if (fb_info->skip_vt_switch) - pm_vt_switch_required(fb_info->dev, false); + pm_vt_switch_required(fb_info->device, false); else - pm_vt_switch_required(fb_info->dev, true); + pm_vt_switch_required(fb_info->device, true); fb_var_to_videomode(&mode, &fb_info->var); fb_add_videomode(&mode, &fb_info->modelist); @@ -1520,7 +1520,7 @@ static void unlink_framebuffer(struct fb_info *fb_info) device_destroy(fb_class, MKDEV(FB_MAJOR, i)); - pm_vt_switch_unregister(fb_info->dev); + pm_vt_switch_unregister(fb_info->device); unbind_console(fb_info); From patchwork Tue Jun 13 11:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461928vqr; Tue, 13 Jun 2023 04:13:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6P6m3iVIkvrCS1qlKz6Ykk+ZTy7vC0ZXqz13Y+1BubJewpZPVu9iSAUGECJhzcVmveqemY X-Received: by 2002:a17:906:fe4d:b0:978:2b56:d76f with SMTP id wz13-20020a170906fe4d00b009782b56d76fmr11988068ejb.41.1686654829696; Tue, 13 Jun 2023 04:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654829; cv=none; d=google.com; s=arc-20160816; b=Zbn/NlSyJ7Ieh3v/RTeyC10EVQUnGHONZa/bsfi0bru+M3V/KXsg+7ayDADK7EOBLg NCePYneRrx7AzrCJHJQyg4AAhzG6cQGijpUpdZOfirEHXww8jwT1+yqa7ES82UBlqS8R x5LFV+Qaebu5HtdcdfOXdVvhxh4ijCiYHievj0osL9r3PlPpFkP1jqfzEFv4C8I6bKHo HOBpWpys3p01X7/nEwuCatakqSFWyz/bQGpnvQ35z/G4kxV7AVogMBjUyWfirwBLQzQk NJd8j6jmR/UhHlTOLFubhpCW0DjGZPA9cSlbfKN0DKHN3lcgUPPoKoW3NIgwhrMZYFIO bg/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=4fsDwK3/MzhO/+4V6RVPaJy4VYKnZ6Si9bcp6FJanXE=; b=AKHjQKZ7NaYn+OKUAM8LCf008u9TnDp9s+iG4VCUhONOnriLLeF2OaYe+yL9d3Jf/4 b4Ef6q14TWUxoGx322oEIgc2L/vYOnYtPXE7S5F2EuotYC/GNh/HHZBNY4JDl2isf/xv tuVFujGj3mwgEFzySbQv5TVqq/QVM00p2CYwds0KeAQEL5lX1QihGwWmoB4nlmDEiKLL MH703SST/yJn7DM6WFv4Cqk5F2/pUFJAKLTdN1+WrEzgtKBi0DE2ZPAvZCE2D+GD8AFO UdXq6CviFditwePTQEd1GQjm6xLKTg3CABXf22xMLEqkKsncSc/130SMyagRMalTmfz6 RfTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ejpVMux/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="eOd/H7sw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f6-20020a1709062c4600b0094f13e1a269si5678452ejh.970.2023.06.13.04.13.22; Tue, 13 Jun 2023 04:13:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ejpVMux/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="eOd/H7sw"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242250AbjFMLMi (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242132AbjFMLKK (ORCPT ); Tue, 13 Jun 2023 07:10:10 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AA0D92; Tue, 13 Jun 2023 04:10:08 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 206FB1FDB8; Tue, 13 Jun 2023 11:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654607; h=from:from:reply-to: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=4fsDwK3/MzhO/+4V6RVPaJy4VYKnZ6Si9bcp6FJanXE=; b=ejpVMux/b1QuE5CJU6PidS4DSV7XpXpptL73BBmKjZGHoVUoCLKEqBaQWRtkjAhQ61y1Pp qa2g7rJnvYOL7o74S/7RQsaur4g1DY3M1VvCeiMisUuC41kue4jW0NG16qV8nrARnawUHp pB/d21/T1XNPywj8DQb8SVxigC6P5VI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654607; h=from:from:reply-to: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=4fsDwK3/MzhO/+4V6RVPaJy4VYKnZ6Si9bcp6FJanXE=; b=eOd/H7swFJ8KgbTzvhB+A/cbC2LClWf584d8eN8j0pTCDq86IAYSI+ISMpWCOFnbaXBrdH ni1jqg3WGf3hZUDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BFE8413A47; Tue, 13 Jun 2023 11:10:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 6GEALo5OiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:06 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 33/38] fbdev/core: Move framebuffer and backlight helpers into separate files Date: Tue, 13 Jun 2023 13:07:08 +0200 Message-ID: <20230613110953.24176-34-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585774732217254?= X-GMAIL-MSGID: =?utf-8?q?1768585774732217254?= Move framebuffer and backlight helpers into separate files. Leave fbsysfs.c to sysfs-related code. No functional changes. The framebuffer helpers are not in fbmem.c because they are under GPL-2.0-or-later copyright, while fbmem.c is GPL-2.0. v2: * include (Sam) Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/core/Makefile | 4 +- drivers/video/fbdev/core/fb_backlight.c | 33 +++++++ drivers/video/fbdev/core/fb_info.c | 78 +++++++++++++++++ drivers/video/fbdev/core/fbsysfs.c | 110 +----------------------- 4 files changed, 115 insertions(+), 110 deletions(-) create mode 100644 drivers/video/fbdev/core/fb_backlight.c create mode 100644 drivers/video/fbdev/core/fb_info.c diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile index 8f0060160ffb7..eee3295bc2252 100644 --- a/drivers/video/fbdev/core/Makefile +++ b/drivers/video/fbdev/core/Makefile @@ -1,7 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FB_NOTIFY) += fb_notify.o obj-$(CONFIG_FB) += fb.o -fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ +fb-y := fb_backlight.o \ + fb_info.o \ + fbmem.o fbmon.o fbcmap.o fbsysfs.o \ modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o diff --git a/drivers/video/fbdev/core/fb_backlight.c b/drivers/video/fbdev/core/fb_backlight.c new file mode 100644 index 0000000000000..e2d3b3adc870f --- /dev/null +++ b/drivers/video/fbdev/core/fb_backlight.c @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include + +#if IS_ENABLED(CONFIG_FB_BACKLIGHT) +/* + * This function generates a linear backlight curve + * + * 0: off + * 1-7: min + * 8-127: linear from min to max + */ +void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max) +{ + unsigned int i, flat, count, range = (max - min); + + mutex_lock(&fb_info->bl_curve_mutex); + + fb_info->bl_curve[0] = off; + + for (flat = 1; flat < (FB_BACKLIGHT_LEVELS / 16); ++flat) + fb_info->bl_curve[flat] = min; + + count = FB_BACKLIGHT_LEVELS * 15 / 16; + for (i = 0; i < count; ++i) + fb_info->bl_curve[flat + i] = min + (range * (i + 1) / count); + + mutex_unlock(&fb_info->bl_curve_mutex); +} +EXPORT_SYMBOL_GPL(fb_bl_default_curve); +#endif diff --git a/drivers/video/fbdev/core/fb_info.c b/drivers/video/fbdev/core/fb_info.c new file mode 100644 index 0000000000000..8bdbefdd4b701 --- /dev/null +++ b/drivers/video/fbdev/core/fb_info.c @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include + +/** + * framebuffer_alloc - creates a new frame buffer info structure + * + * @size: size of driver private data, can be zero + * @dev: pointer to the device for this fb, this can be NULL + * + * Creates a new frame buffer info structure. Also reserves @size bytes + * for driver private data (info->par). info->par (if any) will be + * aligned to sizeof(long). + * + * Returns the new structure, or NULL if an error occurred. + * + */ +struct fb_info *framebuffer_alloc(size_t size, struct device *dev) +{ +#define BYTES_PER_LONG (BITS_PER_LONG/8) +#define PADDING (BYTES_PER_LONG - (sizeof(struct fb_info) % BYTES_PER_LONG)) + int fb_info_size = sizeof(struct fb_info); + struct fb_info *info; + char *p; + + if (size) + fb_info_size += PADDING; + + p = kzalloc(fb_info_size + size, GFP_KERNEL); + + if (!p) + return NULL; + + info = (struct fb_info *) p; + + if (size) + info->par = p + fb_info_size; + + info->device = dev; + info->fbcon_rotate_hint = -1; + +#if IS_ENABLED(CONFIG_FB_BACKLIGHT) + mutex_init(&info->bl_curve_mutex); +#endif + + return info; +#undef PADDING +#undef BYTES_PER_LONG +} +EXPORT_SYMBOL(framebuffer_alloc); + +/** + * framebuffer_release - marks the structure available for freeing + * + * @info: frame buffer info structure + * + * Drop the reference count of the device embedded in the + * framebuffer info structure. + * + */ +void framebuffer_release(struct fb_info *info) +{ + if (!info) + return; + + if (WARN_ON(refcount_read(&info->count))) + return; + +#if IS_ENABLED(CONFIG_FB_BACKLIGHT) + mutex_destroy(&info->bl_curve_mutex); +#endif + + kfree(info); +} +EXPORT_SYMBOL(framebuffer_release); diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c index 0c33c4adcd798..849073f1ca067 100644 --- a/drivers/video/fbdev/core/fbsysfs.c +++ b/drivers/video/fbdev/core/fbsysfs.c @@ -5,93 +5,12 @@ * Copyright (c) 2004 James Simmons */ -/* - * Note: currently there's only stubs for framebuffer_alloc and - * framebuffer_release here. The reson for that is that until all drivers - * are converted to use it a sysfsification will open OOPSable races. - */ - -#include -#include +#include #include #include -#include -#include #define FB_SYSFS_FLAG_ATTR 1 -/** - * framebuffer_alloc - creates a new frame buffer info structure - * - * @size: size of driver private data, can be zero - * @dev: pointer to the device for this fb, this can be NULL - * - * Creates a new frame buffer info structure. Also reserves @size bytes - * for driver private data (info->par). info->par (if any) will be - * aligned to sizeof(long). - * - * Returns the new structure, or NULL if an error occurred. - * - */ -struct fb_info *framebuffer_alloc(size_t size, struct device *dev) -{ -#define BYTES_PER_LONG (BITS_PER_LONG/8) -#define PADDING (BYTES_PER_LONG - (sizeof(struct fb_info) % BYTES_PER_LONG)) - int fb_info_size = sizeof(struct fb_info); - struct fb_info *info; - char *p; - - if (size) - fb_info_size += PADDING; - - p = kzalloc(fb_info_size + size, GFP_KERNEL); - - if (!p) - return NULL; - - info = (struct fb_info *) p; - - if (size) - info->par = p + fb_info_size; - - info->device = dev; - info->fbcon_rotate_hint = -1; - -#if IS_ENABLED(CONFIG_FB_BACKLIGHT) - mutex_init(&info->bl_curve_mutex); -#endif - - return info; -#undef PADDING -#undef BYTES_PER_LONG -} -EXPORT_SYMBOL(framebuffer_alloc); - -/** - * framebuffer_release - marks the structure available for freeing - * - * @info: frame buffer info structure - * - * Drop the reference count of the device embedded in the - * framebuffer info structure. - * - */ -void framebuffer_release(struct fb_info *info) -{ - if (!info) - return; - - if (WARN_ON(refcount_read(&info->count))) - return; - -#if IS_ENABLED(CONFIG_FB_BACKLIGHT) - mutex_destroy(&info->bl_curve_mutex); -#endif - - kfree(info); -} -EXPORT_SYMBOL(framebuffer_release); - static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var) { int err; @@ -551,30 +470,3 @@ void fb_cleanup_device(struct fb_info *fb_info) fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR; } } - -#if IS_ENABLED(CONFIG_FB_BACKLIGHT) -/* This function generates a linear backlight curve - * - * 0: off - * 1-7: min - * 8-127: linear from min to max - */ -void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max) -{ - unsigned int i, flat, count, range = (max - min); - - mutex_lock(&fb_info->bl_curve_mutex); - - fb_info->bl_curve[0] = off; - - for (flat = 1; flat < (FB_BACKLIGHT_LEVELS / 16); ++flat) - fb_info->bl_curve[flat] = min; - - count = FB_BACKLIGHT_LEVELS * 15 / 16; - for (i = 0; i < count; ++i) - fb_info->bl_curve[flat + i] = min + (range * (i + 1) / count); - - mutex_unlock(&fb_info->bl_curve_mutex); -} -EXPORT_SYMBOL_GPL(fb_bl_default_curve); -#endif From patchwork Tue Jun 13 11:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 107284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp461923vqr; Tue, 13 Jun 2023 04:13:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7gosR3SlM3Mcq7JNeEd8LZzrnZDK3qIYOXdZgn93UmR+jMs13E6QGNKElHKiE/5UzmAyR6 X-Received: by 2002:a17:907:320e:b0:978:acec:36c0 with SMTP id xg14-20020a170907320e00b00978acec36c0mr11950740ejb.9.1686654828962; Tue, 13 Jun 2023 04:13:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686654828; cv=none; d=google.com; s=arc-20160816; b=R6kibIswctebAtPT76Ys/tDugsmaylTr2SQm2h/Xu7n1WiTri8sPdurZF9CuVTCQgy v5cqY8oZEq7V/7nnnDKPTiBbuSqQ2yZu54pzmd/ECjfvIaCJcas9vUFcEL/rs/+axbsB zjFIxJVNNOSestgIn2fwfwBuQDJwSUrxoVQuHAkUjSk+VibrD7IbADXRyECcROG9Cgfz 73l6K1yoJWw67lWcdELUDavmokpeqxwQPyG8ba7FO/1S9A1daAFJenThA4psp7LrejSy wManjCdnNo+AsT2qDUNuYFhtwCdN3Nj4hiAwUH6flZAHrJAr7xQ8sG0JbHF4ASyoSM29 Qqig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=eAk2/6ibdZH0kfzQKlGiXlQ0sdOrgLY8cFw5r/ejdU0=; b=XlN7QaNhRrtGugf1FhpXjzSdKMW7Z7NIeXn8ubw1m5LDhm8YzMBxYZ+JTs2jtOeww1 Oqz+K5qV5+G3Y3dHzbfwqPAsIvEx8Iche3NEUx+0MhLJ3TfMYpPUNbmcs1MBpuZ0kL3p GTUwe2jy+wh7IZJTzvyGlOhu4H2ZKto5yEQfJBby3GDGNsXhU9kHNXMNBjm2rO1d4xd0 L0zFtH7vY/WpqNS/sptdlvfrvaz4cwxIeP3gd/mRiMuCNwCO913Sq0kYBaERiQKODuv0 f4GmbP3CGATtxWSXhWiDOY8nC+CjLcLksc3MEonOdFeOdLyegZymVcA5wtQ4p9MVzpI8 NnUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=UAeqG60H; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bo7-20020a0564020b2700b00514ad913e9csi7368807edb.99.2023.06.13.04.13.23; Tue, 13 Jun 2023 04:13:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=UAeqG60H; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242104AbjFMLMo (ORCPT + 99 others); Tue, 13 Jun 2023 07:12:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242133AbjFMLKK (ORCPT ); Tue, 13 Jun 2023 07:10:10 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D07DE10E2; Tue, 13 Jun 2023 04:10:08 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 654481FD9B; Tue, 13 Jun 2023 11:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686654607; h=from:from:reply-to: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=eAk2/6ibdZH0kfzQKlGiXlQ0sdOrgLY8cFw5r/ejdU0=; b=UAeqG60HF96B34Zb8zAbsUHqHdqePI2Hx+bnLL2Px0TLj8a3mnzADulBJ3wVGidBG0o4Ko GlRFMR0g+DavopvYU02zi+YPIXlu+Mwqsmkb89lFkWP0LZCqqiMRg6G8kWKD1l3QKjqMRm 9Ueg7GU1QujWs6zJj1+WUvWDZd2mw1M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686654607; h=from:from:reply-to: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=eAk2/6ibdZH0kfzQKlGiXlQ0sdOrgLY8cFw5r/ejdU0=; b=n/47xsMt6I3VTPwwvPdH3F4k2gEB1fB8VpAdKGbLNVTKuiWzNRDqSR0yvco+uSJm7HMV+e TvFvFmys1fyp9LAg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 180FE13483; Tue, 13 Jun 2023 11:10:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wPfyBI9OiGR8CQAAMHmgww (envelope-from ); Tue, 13 Jun 2023 11:10:07 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, javierm@redhat.com, sam@ravnborg.org, deller@gmx.de, geert+renesas@glider.be, lee@kernel.org, daniel.thompson@linaro.org, jingoohan1@gmail.com, dan.carpenter@linaro.org, michael.j.ruhl@intel.com Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sh@vger.kernel.org, linux-omap@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 34/38] fbdev/core: Add fb_device_{create,destroy}() Date: Tue, 13 Jun 2023 13:07:09 +0200 Message-ID: <20230613110953.24176-35-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230613110953.24176-1-tzimmermann@suse.de> References: <20230613110953.24176-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768585773562936869?= X-GMAIL-MSGID: =?utf-8?q?1768585773562936869?= Move the logic to create and destroy fbdev devices into the new helpers fb_device_create() and fb_device_destroy(). There was a call to fb_cleanup_device() in do_unregister_framebuffer() that was too late. The device had already been removed at this point. Move the call into fb_device_destroy(). Declare the helpers in the new internal header file fb_internal.h, as they are only used within the fbdev core module. Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/core/fb_internal.h | 12 ++++++++ drivers/video/fbdev/core/fbmem.c | 21 +++----------- drivers/video/fbdev/core/fbsysfs.c | 38 ++++++++++++++++++++++++-- include/linux/fb.h | 3 -- 4 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 drivers/video/fbdev/core/fb_internal.h diff --git a/drivers/video/fbdev/core/fb_internal.h b/drivers/video/fbdev/core/fb_internal.h new file mode 100644 index 0000000000000..0b9640ae7a3d2 --- /dev/null +++ b/drivers/video/fbdev/core/fb_internal.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _FB_INTERNAL_H +#define _FB_INTERNAL_H + +struct fb_info; + +/* fbsysfs.c */ +int fb_device_create(struct fb_info *fb_info); +void fb_device_destroy(struct fb_info *fb_info); + +#endif diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index f91ae7d4c94d6..66532774d351e 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -40,6 +40,8 @@ #include