From patchwork Mon Jun 12 14:07: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: 106606 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2620025vqr; Mon, 12 Jun 2023 07:15:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ53/LcnRa0bDt2MStxQPhr0rhDmi7kJFv3Tw4mP+8ywMpsg8YTQYOqSdbJ3J3G5jBoztmvj X-Received: by 2002:a19:d612:0:b0:4f7:4446:c333 with SMTP id n18-20020a19d612000000b004f74446c333mr1892433lfg.62.1686579322462; Mon, 12 Jun 2023 07:15:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579322; cv=none; d=google.com; s=arc-20160816; b=t2MQZjz2LhPPplH4cBOaixjj/4kWm4FvfOAQCpV1vGrZuRe7SLJlw0vRNIVpGpauzT 7G1mO4X/+esU7W0vsJD23HAgUmpw8hVKjqyij0jUkiGhDB31QxNeSZjjeZeFdJmzROEj Yn242f4bD2ifpf/xJRkRvZZDp+iJKqEIB7D0tCiK+cdpDco6G3/OhFcxSWHFoDkVoivn rnXVVKzSIwNzCsvAaWz7BksDlWAFeSdhhRh9Os9daDsKdbLocKcuqip3DDYS2LtLjCJ7 4DcMM2OLGLvtBnP1jPex9u9FoPI7iKkYcLAlmZ2E26o1rc/QRhpPi0fYW2Ss9EN75PM0 smZA== 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=3sJSCjaVrA7kDwsrSwIFOa10blfEXLpB2Uw9gtvLkjg=; b=KYgJpZ8YOXb/430ZegNU1ZT8SAxbcleiUowEHz5eeRFMWNDxCUELnjR8mWfGmPGfK4 jMx6s4qsAKqB7K2F1ylJcl3/CA0XX2UzaIrOlMsz/EbmAX8n8OJx8o6PIGfBh/JaD/m4 3B88OrHE5binhlGvKk7Xz7eZIaNJlLNGkC/kvg2EMOtrAZc+pbzTXTcTmoMXUDvvm+wA kyD1tCPWVY2T6r4tmffFZbvaLzSVVuEQcONgkcnB8klByGUNUf3MJ4VGwVm03GUJxYNJ f7AyHHAQUIz+5m1az2k61vrAJXKo6/4gCo3pwF82Z8uyN7luk29emPbkQNCfSE1c6Dpu yrtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hSBd0hsG; 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-20020a0564020b2700b00514ad913e9csi6143185edb.99.2023.06.12.07.14.57; Mon, 12 Jun 2023 07:15:22 -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=hSBd0hsG; 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 S237426AbjFLOOL (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237238AbjFLON5 (ORCPT ); Mon, 12 Jun 2023 10:13:57 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D3DA19C; Mon, 12 Jun 2023 07:13:56 -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 E923D2271D; Mon, 12 Jun 2023 14:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579234; 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=3sJSCjaVrA7kDwsrSwIFOa10blfEXLpB2Uw9gtvLkjg=; b=hSBd0hsGveWAwWxApwvgqEoJMAbiHbtdo6ToeFC9hidvZd4Dj3dh9eMWiZ9HXxb6304RoF qm+dmkUJq5oihn7VHddM/vf0lwkeUfkKEzMPJvCv6rJkewBDlvJlNBIEPVO/axkFuF5P9/ SlpLfIpSmocHahtOoniSdFfgRnK02Lw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579234; 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=3sJSCjaVrA7kDwsrSwIFOa10blfEXLpB2Uw9gtvLkjg=; b=S1Jgo2ktxPghsHrzmX5ucnsVoDw+3nWTiUxOOv9/3vDPBmzJHmE070HuxLR1cReJdfmdMM tC1mAtvhCy6U1dBQ== 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 7A36A13A67; Mon, 12 Jun 2023 14:13:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kLPCHCIoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13:54 +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 v2 01/38] backlight/bd6107: Compare against struct fb_info.device Date: Mon, 12 Jun 2023 16:07:39 +0200 Message-ID: <20230612141352.29939-2-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506599958287641?= X-GMAIL-MSGID: =?utf-8?q?1768506599958287641?= 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: 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 Mon Jun 12 14:07: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: 106605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2619930vqr; Mon, 12 Jun 2023 07:15:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5gEX49n5x6Aqjgd03A8KwDrrr+SZs93dzNWPMdrOcLrG0uEFMyp+MqOzYXGpo11aEs3wbB X-Received: by 2002:a17:907:728b:b0:97d:a87a:f4db with SMTP id dt11-20020a170907728b00b0097da87af4dbmr7637977ejc.66.1686579316454; Mon, 12 Jun 2023 07:15:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579316; cv=none; d=google.com; s=arc-20160816; b=CuhSpwTtK8GnWZLUTpkDGp0QWTvZy6zFNjuQo37VvP9ckySBIp3U9RQCQud9Qj2nCo Xg4J3TxKPINIZkfZ3iw+1AgfQF8rEJbDUsN7WCAN4x/CbLbzjPAUZeuIuhnSRXhhOqFa o3OYJ6aQAlcdzTW9xNAYZrXfNylV0bfLfv6gUlZbQ6SnSXKxdv4yKZiSgnPcxIA0w+Y7 G1HPQBawAvOhylJPG/oZejxzm8wL3IFVphuuOkXNMAWy/DcNkBPjl3cdh5QEHj7r4/// l7lCGS3Gx2ZnRT+jntLzfzrnsuzk+0vc4FTOf/agQ9FngQc+SWMpwRMSPk0uY6tKnjCl pmAA== 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=BdOpqd8riEVy6A6ndCU3FeJdbnI01l1n5vgXheBRNPM=; b=ptdbfmHeo4kwOYBSv3jc8ELSGrNH3XRwt7zn4d7+AKsIEzPqeQDu8P6/IVaXQzi0VL u0rXdfzV2ogEb4XuFV+8hElPHSCTDjECeen5HKMOgCsLLLQQxcfdBzotfNBO95owMiPo a1EOTjHxju6G/I4zuV1jkxNdkQq80WwQzcGbtVEccjZICLlOo1wYO9x6p4gq96ClEt6q dzNliPQ2ndKNpHNbNnDUf+P/iDMTyrBGIU4OTqmpLGOe2lsLa/mPx4LlKHLC0G7set7v K/rqzXMbC0IyIPZyxDCqp08iIg34Ownm+1r2jniac58B3W13iIC7LF/0lJffAsgACHGO GOHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=AX0PqU26; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="s/HWL2JP"; 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 ko6-20020a170907986600b0097461d96871si5806822ejc.968.2023.06.12.07.14.51; Mon, 12 Jun 2023 07:15:16 -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=AX0PqU26; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="s/HWL2JP"; 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 S237372AbjFLOOI (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237240AbjFLON5 (ORCPT ); Mon, 12 Jun 2023 10:13:57 -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 A210E10D9; Mon, 12 Jun 2023 07:13:56 -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 3DCDE20303; Mon, 12 Jun 2023 14:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579235; 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=BdOpqd8riEVy6A6ndCU3FeJdbnI01l1n5vgXheBRNPM=; b=AX0PqU26N96lUG8W5y7ONitKYXtqFi+jo9/EH6RW6PPDtdArtp+VmLtBpjjaGPUUstQA4n 6D99kkMFBjs1NA43aDerFxT22vaZ5/yd61oWOicl3JupuPpYgetNnxWYKo8xzqtVr1XhPM dJkNcERrnE8H9dRs2zd06EwhYSAghIU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579235; 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=BdOpqd8riEVy6A6ndCU3FeJdbnI01l1n5vgXheBRNPM=; b=s/HWL2JP2+LDna9JvfXlutTSDq6MopUeTKYUZ+Lse0DhdZBKpPNV4NbCdJKeW14gszKv7T lmM07QWInHF3TWAA== 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 EC8541357F; Mon, 12 Jun 2023 14:13:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OEz3OCIoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13:54 +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 v2 02/38] backlight/bd6107: Rename struct bd6107_platform_data.fbdev to 'dev' Date: Mon, 12 Jun 2023 16:07:40 +0200 Message-ID: <20230612141352.29939-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506593357055436?= X-GMAIL-MSGID: =?utf-8?q?1768506593357055436?= 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: 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 Mon Jun 12 14:07: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: 106615 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2627013vqr; Mon, 12 Jun 2023 07:26:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4aZDI/PGIiYtKGHgRqfaVBDArbB5sIGfRJinErGt0izdwlUc1M7ugiuNItZ/FtIfiXIn7E X-Received: by 2002:a05:6a20:a296:b0:105:b75e:9df6 with SMTP id a22-20020a056a20a29600b00105b75e9df6mr7999249pzl.26.1686579970234; Mon, 12 Jun 2023 07:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579970; cv=none; d=google.com; s=arc-20160816; b=nPeUWjt8/+Jqd3QXQBMLyGNV2JodOT4ed57aIaoDQdz5ePi9sVbKBVbLPi7h4a9VLE PXwzBvkSu38TiWUm4lMeNo6DMd8Fq08Rs6sOrIC3grVhWEThPiJsn40bA+eA6cRTpKuN rj9Lj01f+e2wPmnRcOHBv7uCTsTqB6x+GqqC0NPtedPek1q4BKsNf4B/FMO29tsiz9y6 /+adZ/9JzJDOZ4ashehcpKHldxVIg2VwjNKc+j1y8VtYzmXl2mqcWWA6LY11eR7gYnvu Dh575M2bq+3bcYFRDz4OQj8QNqaadHXDLNvli3u0Jy9KoaATHQNKEOLZbmWA97z0iZZj RM/Q== 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=N0U73OI9Djyvpf7OFfe/PElrlLyfs3mR4DlDznv7row=; b=UTPgU7KA8Wxu3v2yHvTgiPmJhrwnsaF8AW//fEtTjfTrqHuwZext5jdrjJxGykCuA/ DRMm3u9WEYx4GIyGRCLDVBTxnYSysJNE0htGTthZQmpT4i43H9P3yPkUtvSSMvc95n4G UWOww0B/UEvx90KKQLqVp+SQbIsu4BvA9gfVjh3nS5xIfSb4uH+VoUM/R5I2EnJcD1lp Wzstk6a3P2R6HHyw9Gvtg7ITP4ocFiI9HbMAJvRNyYnCLDJ6EAjOG9lp0zNWvxjhKd9v nZvTMKTzAXPQIZbetdJx1tEQGazop+u3M23OQT3l8NB21vVj8K/JdOELnshBDc/gniYk fUwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="YE4/WV2r"; 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 c29-20020a63725d000000b0053fb3bd8ee3si6825314pgn.806.2023.06.12.07.25.57; Mon, 12 Jun 2023 07:26: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="YE4/WV2r"; 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 S237488AbjFLOOS (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237248AbjFLON6 (ORCPT ); Mon, 12 Jun 2023 10:13:58 -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 26FFD10E5; Mon, 12 Jun 2023 07:13: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 9DDCD2030A; Mon, 12 Jun 2023 14:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579235; 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=N0U73OI9Djyvpf7OFfe/PElrlLyfs3mR4DlDznv7row=; b=YE4/WV2r1Ql9ifThU6A7Vx7R8OqlaMrtKKMcFE8HfFVIUk8DCn+9PFxHYKx8vCRC7YNg20 fzV5JkTeR+KCyjKjy4AYmoz71TTF8vnr5fim/oGxoZg3GHqXivh78xFeRlFtFz30y8plcy NE0Tv+FMO2Gktr1IMIQrKzrm5XV9bJ4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579235; 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=N0U73OI9Djyvpf7OFfe/PElrlLyfs3mR4DlDznv7row=; b=JLteH/sTOP7W/jEknMtC/ARhjRGc619iRq0RB5jLZkvz0tqOOG1G58ol4QyCe3VvxbGL3C 3oSES+ruDCBhe6Ag== 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 435F21357F; Mon, 12 Jun 2023 14:13:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uFmTDyMoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13:55 +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 v2 03/38] backlight/gpio_backlight: Compare against struct fb_info.device Date: Mon, 12 Jun 2023 16:07:41 +0200 Message-ID: <20230612141352.29939-4-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507279192328493?= X-GMAIL-MSGID: =?utf-8?q?1768507279192328493?= 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: 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 Mon Jun 12 14:07: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: 106607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2620301vqr; Mon, 12 Jun 2023 07:15:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Cp7G7oWbIrijxSTaNNZHK6lYihlfGZKbCAf4FBtvZRwbE/Q6/8ODBCN1oBSZNiklXQVsT X-Received: by 2002:a17:907:d87:b0:94e:2db:533e with SMTP id go7-20020a1709070d8700b0094e02db533emr10532691ejc.49.1686579343974; Mon, 12 Jun 2023 07:15:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579343; cv=none; d=google.com; s=arc-20160816; b=XrhkYSFFxpufHqNPjdoucQ4NEaqhKETQe4VwyBW9iBuYIKkleRjIxtn3cObglWBfFC 0i5aP5UR+jaDzjPASZSmrw+Io9SeWeN7XdKinsXVlGNwHJE6EzkCz2XDJemlw9+Z1rnI 7zP1vqz/8w5u3gyWAI5IADVyPLeLZqr4cRfPDIhscU4Op6jTPQHtrcCshjJKR7XDJMko mB7xjjmn6cqM23tmypnUsEEuvzGmxuGcI7RgU/oSjnQS/0odUjXkKDtCEeDYomRZ5OE7 K+Ox8bj0L+Gza++ORtqvo3Q0mMEymdCR1N8hlUNNPNX9QQ3S59/wXooCJTi+1RYVuyHv bQ4w== 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=WCRr3tcfQ+ViTqvRJUG7w6CzJZFM3ZnmBQeGqDoFNyA=; b=BakO3RHJ4W76P/Q6R092b3BkpTiq4ewX916AZDQFl/2Em2aFzqyRobZdVBOslprl/y 8nlw2bHzqqR1DxGsL/3MGQLCchYGNIpcSX4WcnZRWZqlu8WVPQVIj7TB0iPnZFgy3J27 gE1qRzpSQnFW2bU9Z9Kp1VXk3d0BZOtq22bTU+aZPbmPm7vm88q1Zwdyz45ZcjKWGQyD eXa+q95yc8P3CVwwpoT6qGZd36NfhGynj426jqQRT7pNkoOn2+DCr2I8Zdf2X5AWf9aT +ZwhO2nQgzQbx5P6fuCbShjZhDDSWZxcH0xYgk3WzBCyv6uNAhzQuPYNQVgG70Lb66MK Qw1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=B3c7FJ0o; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=nP6ok9tG; 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 i23-20020a170906091700b0096f53f61cc8si2635283ejd.967.2023.06.12.07.15.18; Mon, 12 Jun 2023 07:15:43 -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=B3c7FJ0o; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=nP6ok9tG; 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 S237530AbjFLOOV (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237249AbjFLON6 (ORCPT ); Mon, 12 Jun 2023 10:13:58 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 849B810E9; Mon, 12 Jun 2023 07:13: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 0393A201D6; Mon, 12 Jun 2023 14:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579236; 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=WCRr3tcfQ+ViTqvRJUG7w6CzJZFM3ZnmBQeGqDoFNyA=; b=B3c7FJ0o7rKovAlVqxsu+Jc3wMWjZdExXH2p5ByRwfcFc+ilXqYes3ifuEtwAiiCrDIhN8 cPt41wJHss0O3oTTg6pLfOWZEbyVZDdAH1WzxWbDAJligcdGIGgmJWO5l3MfvcQSUtUMFl wlaLfObvsRRjCNdzMpHBMhHseFCyxzg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579236; 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=WCRr3tcfQ+ViTqvRJUG7w6CzJZFM3ZnmBQeGqDoFNyA=; b=nP6ok9tGNYJPhTfSJhnOUhfUDt2dDp8Vtejn+3CZPIECp+BZnHlWEb0ubXBjmw/nIr8MW4 sgkJX4ml2AN+WhBw== 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 A2A3C13A67; Mon, 12 Jun 2023 14:13:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kCbcJiMoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13:55 +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 v2 04/38] backlight/gpio_backlight: Rename field 'fbdev' to 'dev' Date: Mon, 12 Jun 2023 16:07:42 +0200 Message-ID: <20230612141352.29939-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506622089130373?= X-GMAIL-MSGID: =?utf-8?q?1768506622089130373?= 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: 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 Mon Jun 12 14:07: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: 106652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2637124vqr; Mon, 12 Jun 2023 07:42:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4JoeEvVs1M+7/SzGkla9uh1j3E2sl6NtTG2iSBl/AwHIgzFumKGcZ246SZHYXFvp06s9h4 X-Received: by 2002:a17:902:8502:b0:1ae:8892:7d27 with SMTP id bj2-20020a170902850200b001ae88927d27mr6856791plb.42.1686580974297; Mon, 12 Jun 2023 07:42:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580974; cv=none; d=google.com; s=arc-20160816; b=cu3+Ens5AbyAzqeT4+oj/AJouzSI2V5AMZsDtOz1UqO7076JaOzVTcHz4vJe0sQ5Da UUBOKXqxZ7o9T+54yWmCZgl1CUYcJa/onMn7OUchPsEql6N44g5R/IQuQZufmwz2m8R3 PNGG/PKOy4e4I2sHeyi4MGTuexEsErVwOG6r3U/FmeghVe0Q9xRD+F+gBzQSfx7Isrcl KLWuf0am/IQ5Ifj7Z7KmABW9KxLor2bJeM22ibuGknMVZpj4TBgeVEZbYX6jcN/DXwYW ueb2urMm+9P5i1+qxfkD5dXab1Pj/Nrx3OZE2XTVtxAmqciiaYYwNx+3Gea9pyprz2fm gsqQ== 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=/aATnyJ6/OJWvj1ak0QEX6CtbSFf+k3ol6fqKdKcpbY=; b=DPy/wgl3sv9671l3HI6S6emuOwhQQSPp9B6r6XsabpbsSo2/ejoV77LlNuRrakpaMw wuFDScWNZhngfY+Ht815YS7uSmmkBHh3SyqZkW4bhbKXG8N/5i2ZU7C9mnL5T2N097OU lda3S6qBVpdUrYbaIrcEGoZXIjdE0sWAKV259XTIwbOuwjwKmkAModI0WhLkfKltOxUr Ap+O5M3zhoTOXGPdwQoEY8dgzzuN0wuz+7YsfUefMgSzsJEstCXl9BLYcyHat0cz4+q9 RJdXwXSUXNnyNE8Gbg4HtZ1OpdNJCwmpiSfa6gUqo38wrZUF9f/thIpM+GVj6lbK/7H9 l1mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=GKSAR9ll; 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 t5-20020a17090340c500b001a65688c863si7239265pld.56.2023.06.12.07.42.41; Mon, 12 Jun 2023 07:42:54 -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=GKSAR9ll; 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 S237341AbjFLOOz (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237252AbjFLON6 (ORCPT ); Mon, 12 Jun 2023 10:13:58 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B95EE10F3; Mon, 12 Jun 2023 07:13: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-out1.suse.de (Postfix) with ESMTPS id 6A7B322835; Mon, 12 Jun 2023 14:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579236; 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=/aATnyJ6/OJWvj1ak0QEX6CtbSFf+k3ol6fqKdKcpbY=; b=GKSAR9llpzoRb1YAHGMn59ehs3RdP/qsyIwYHuqykmMy8UbQBJxbWlozUxBV2Kk8ieiXoi CGzfzAWPRp5ZQVdK2jhS3Rwej1/Sdaz9iWMgHT5CNQG7muHGkVW9gOxI579yI1bZDsn6mW w0KEwahMfLFSvNUrsfQpC21kOIjvgXo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579236; 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=/aATnyJ6/OJWvj1ak0QEX6CtbSFf+k3ol6fqKdKcpbY=; b=8C1WsCwEcFOi7n+yF6oBfxuoV7DwqTBh4HrRIW/hb+ocNUoWuqFRkb8AOk4ZB/0HEBLlKu mAMWZRvDycxEyaCQ== 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 0B49B1357F; Mon, 12 Jun 2023 14:13:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id IKWnASQoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , stable@vger.kernel.org Subject: [PATCH v2 05/38] backlight/lv5207lp: Compare against struct fb_info.device Date: Mon, 12 Jun 2023 16:07:43 +0200 Message-ID: <20230612141352.29939-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508331785972476?= X-GMAIL-MSGID: =?utf-8?q?1768508331785972476?= 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: 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 Mon Jun 12 14:07: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: 106622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2628998vqr; Mon, 12 Jun 2023 07:29:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6JHiUzUX6VfI5NHC9a2k1TVJwHrod7F7WkqhHjd2Cj69lVZHpYDY2K9SdPqq/S1xk9rb9j X-Received: by 2002:aa7:dad4:0:b0:514:a376:9e12 with SMTP id x20-20020aa7dad4000000b00514a3769e12mr4392580eds.26.1686580179502; Mon, 12 Jun 2023 07:29:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580179; cv=none; d=google.com; s=arc-20160816; b=GOOaQtnENb8J7U3+GmxtAUSEW0KB65y+ii3SGmRluPJfT/Uyet/Rk+q0/qGlI6BPRu AHrWZH6aA15NBKqjDVErXo/pgVTBKj+q1xbP5JKZ4DznxmdyPGmaApvhYzPTXd2vBdEi aiYtgbEF8pWls7oHYwL979oO24DQIfKUY6TOzQlOYveneFbBIH07RxEGn4iunjypaOtA SyPbNdIAUOm0EakV8YAH8Tyg06wDoU77DWZ1KyuCMERN5aIECFjKlZE3ohiZgXvfS+4Y ux7QJKrcpw8M0I1akenrSteovUULMgw2Sw3SaWhd63gXAJZchesS0/omPWIk5kBiKIgx hxYQ== 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=YweYg5QlxrvSMFXdEzvC/VBZz/0c3f7S0HZGS4SbqFk=; b=uo9u+Pq5WPVBL4BjjWWrw8CwmIigC0BnA+Wa/GDF6fnUCrqqpjCTIx8J9SnsoRdiUv X3qUR/Wmj8ZH6UeJBfmPI5+DrQ+nFzG+/6OnFX3wETJpjU+IQcZ55c0ZYN80VMjnNrSn bLAjtbRyOAqElO9TV38qe3ZxdvmyUFjCc22Ln3pNMRe6ChBYX5Vbh6wCGwm/CQZXkhg+ X/Qm1eGWDmw8x25U/l3E+eOYhBui5yYFfB/5/rjBliaSmE0iDVBR8RWlxoO7GZLnDiB+ yB+4hTn7Hf9RhYOFrMC8+a7tfydHjirhqv4HNQBUEAZ/Vk1qjSJXI+g7peQIlOdCCPfQ k3Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=TSfozs5X; 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 f22-20020a05640214d600b00514ad7f8734si5969565edx.294.2023.06.12.07.29.14; Mon, 12 Jun 2023 07:29:39 -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=TSfozs5X; 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 S237964AbjFLOOt (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237265AbjFLON7 (ORCPT ); Mon, 12 Jun 2023 10:13:59 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4909210C4; Mon, 12 Jun 2023 07:13: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 CBA9F2032C; Mon, 12 Jun 2023 14:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579236; 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=YweYg5QlxrvSMFXdEzvC/VBZz/0c3f7S0HZGS4SbqFk=; b=TSfozs5XHmzkm9M1JxPQxso7XdfoqSQtFyLEk7+i2mA4J4YwGdnwrW150DPOtM22bldOEl zYdMUfc9mbHaa/lVGRab3OzQMRxDMNy7ZX/zA85BuuMKUN3pJCgXlArvbxr5XJyzQ2jpJ8 BKjzboD2scSmJyDG2+t0U0dyT6LSCy8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579236; 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=YweYg5QlxrvSMFXdEzvC/VBZz/0c3f7S0HZGS4SbqFk=; b=LuHCGeZkQiXPdQKpizmFnPYmsvbUF60dQ07fBtTOoV2N4fpJp1sZlewIYsXJLxW+j/aRFN mRrCdWgIRc+a30Ag== 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 70A8913A67; Mon, 12 Jun 2023 14:13:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mDedGiQoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz Subject: [PATCH v2 06/38] backlight/lv5207lp: Rename struct lv5207lp_platform_data.fbdev to 'dev' Date: Mon, 12 Jun 2023 16:07:44 +0200 Message-ID: <20230612141352.29939-7-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507498419170842?= X-GMAIL-MSGID: =?utf-8?q?1768507498419170842?= 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: 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 Mon Jun 12 14:07: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: 106627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2630279vqr; Mon, 12 Jun 2023 07:31:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6SvN5d4EF8NngxWi0Lt2tVp/Bm2nO0+O4++j6Bsv0FfCvxCSrUPgzv53pTV8oJdeeMxgA3 X-Received: by 2002:a17:907:1690:b0:965:cc76:7716 with SMTP id hc16-20020a170907169000b00965cc767716mr13128121ejc.76.1686580288576; Mon, 12 Jun 2023 07:31:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580288; cv=none; d=google.com; s=arc-20160816; b=odSZIxWgke9xv+7/RxGanVJbZQ1m7OYGhWbNLcdLxRhUqY6S+olOR0BXuo7SnO/GLn Uivij5Vzu/BZ5Yb4XIvWp/QvpZ+Di24dyGVzVDPjaw0FbGDifUbN9V5AD8qQj4FUy8oe fB/ikIPQ+95nVfXi45pXkFvbx3ioJ+sXpzE37ToNRG4iOGRL4PKIoCihQP623wk/yeTy sboRAcXjZ9Nh3YT1MKmm9Tm65obiWFMnzK8tPv/n4AHHwISiP1sFtwARlcmd1mxTioGU DE43V1sjcrUiUqiPRpGfs0n6chgJljmYkbNuD9cQ3mUfMnvMiSU8CBdLObUwn0kXFyw+ MbEw== 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=JlVcmvzQv7LlXsgvsBhpy1neAHLfhVIo6jMpaCVHhbM=; b=ZoK6JEidQdi82Ds74j6ogwTYIPoK2dJML+1hZ3Xft41RcwEo3A1xyYz+B3kZIJdmQh FRidaK8VIWeCaQsU8LD1R+/RjCXFqswDlD1UZkjoEWswHWn6q3ANG1SIehMLe2G5P06O MJkfWfhuHhc4T4UMmYQWTB74YJvx/3truRGjKwLDKNOE6foiI3+UiwNFS50wkZ0XNVe6 FG7822putBeMD19wZcYKOZRRc8wB0iFjeWKiCLGsfI80c3QHk+CHnWOP2KXp1snpvHKh PPp/5DPryjWst9lPHVSnyvBLZTwzk2GNfKdabEG+X/Hb4Bqd3kF2BfzjNebkzsCT1N7R BZhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=wUxmfirh; 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 k23-20020a170906681700b00974630af98asi1785831ejr.541.2023.06.12.07.30.43; Mon, 12 Jun 2023 07:31: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=wUxmfirh; 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 S237727AbjFLOOo (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237264AbjFLON7 (ORCPT ); Mon, 12 Jun 2023 10:13:59 -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 9A25210E6; Mon, 12 Jun 2023 07:13: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 2BC3222838; Mon, 12 Jun 2023 14:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579237; 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=JlVcmvzQv7LlXsgvsBhpy1neAHLfhVIo6jMpaCVHhbM=; b=wUxmfirh6VNkcGRn6mKsulbVu7QH8bYevkHyb0yYz8XOtHUU9lQb9UBbLCe2ra5EFuFeAI GHLtlmCFTLzGg7xPsoaPpwUKAz9MWA+jd429AluaVrvtYWo6PdjACsDUN8HgPDjNZsJt3b /St0XSCdNwukFwRgPZzlj0KmoO1X94A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579237; 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=JlVcmvzQv7LlXsgvsBhpy1neAHLfhVIo6jMpaCVHhbM=; b=B8siKHLL2vcweQADuS5kOj3W2q2DepX36jW8jW9Pcc4DwS/BlKpty2EBbvgi9gWuZe+Lgs 5sZmH38mKQTYHsBQ== 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 D06C51357F; Mon, 12 Jun 2023 14:13:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sNXyMSQoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 v2 07/38] fbdev/atyfb: Reorder backlight and framebuffer init/cleanup Date: Mon, 12 Jun 2023 16:07:45 +0200 Message-ID: <20230612141352.29939-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507613112422262?= X-GMAIL-MSGID: =?utf-8?q?1768507613112422262?= 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 --- 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 Mon Jun 12 14:07: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: 106613 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2626323vqr; Mon, 12 Jun 2023 07:25:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5TOyAgercmLjwzU9HUnxFBKexSAsVdsGowYcQGcIrKdL8rjMWKypqgeMpB5o1bThBaRd7V X-Received: by 2002:a05:6a00:17a0:b0:656:c971:951 with SMTP id s32-20020a056a0017a000b00656c9710951mr17372304pfg.8.1686579901676; Mon, 12 Jun 2023 07:25:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579901; cv=none; d=google.com; s=arc-20160816; b=EfAm2awXZUJyjUwqi/ss7fCT73axc6lwbhwcCnnmTpNGalBrc0tKjNu2Ih7Kyn2UgY S1ozK4I6eazrkEgikSD9FQb6YyfZYRMwX//OQLqi3Lr0yCMZQDj0AQr3vlfO0veayaok gs/YyEJywG8JjkP6k/92ELC9iV1mHTWT/n54KI1R059nKos/bw9wsgjOcJnpCQTE3kki HRWOkkVtXp5AwrCEXHsC1BLMLQbn3HLY14QNrc+jtPvUeb0LUI3FjhXzo/vtDoYsF/L/ 3RrmuSRdo6ujl1PAozd+mBoILzoqk+pua5M0EP5eeSEJa9ECUjjhSTVw1QLZ9HfNp24F HIpA== 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=V05YqbcHFkVh40/g+io2C7/2OJyvLIuQRZ3y/TKygo8=; b=YyorLBiNCW+WkJDgjDu3sbhCfxppXLAE19ZH+FPAjWIgFFmJ385ul1ms2rbDyYV0g6 dVBjYhU/MzZT5o4cXKQSOPJJ0KNv8R9qXs5ZEFOPYLkrutfGqBkmUd3A5nzdTpKTAG32 0kWQ2TG2N62O15QNljT89p2EQrvIPxkYgdfrgj4sNXZOZCSpbPYH7aQhlzZm+X604Xn4 SXr7b6o1U+8bCVYmoc9J06zU79ILDWDZCDqMGEyZlz9MNpZ0Y3/fjVKkHovfF86os1nT 4MXZDEQRjYh6x9FQDYe9VoLlgfxEqrcrlb9yVHxeY/dzTpOevdIqHPe/ZeIduizBV2Lp IhlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=T2euGdcQ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="vNbQs/Lj"; 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 u75-20020a62794e000000b00652d37a0817si4375869pfc.383.2023.06.12.07.24.49; Mon, 12 Jun 2023 07:25: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=T2euGdcQ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="vNbQs/Lj"; 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 S237566AbjFLOOZ (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237278AbjFLOOA (ORCPT ); Mon, 12 Jun 2023 10:14:00 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFD9219C; Mon, 12 Jun 2023 07:13: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 7D9902283A; Mon, 12 Jun 2023 14:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579237; 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=V05YqbcHFkVh40/g+io2C7/2OJyvLIuQRZ3y/TKygo8=; b=T2euGdcQaW2rmPvlyCi7lJ1mkZrEd72+/fhhzMqgppXGBGopdDkJK5SKyCyb5T/C+loCv+ 6OFAZDBPYb9PXIQchvOTpxeU9n8u/plj9XOG+ofNWocbJ3JWwHNvJJoyI503bSSjY9p9DA e4teRawwOgNlbVcSg2ZLnL3ImsMqKBI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579237; 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=V05YqbcHFkVh40/g+io2C7/2OJyvLIuQRZ3y/TKygo8=; b=vNbQs/Lji8VC4za6ijU1bMo1lBLxsxsTBPEICggoy20po+PG44rdnjGCWFShw4SwgP10Qb 7r4NlZRpNRfDSWAQ== 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 2F94A13A67; Mon, 12 Jun 2023 14:13:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OMbTCiUoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 Subject: [PATCH v2 08/38] fbdev/atyfb: Use hardware device as backlight parent Date: Mon, 12 Jun 2023 16:07:46 +0200 Message-ID: <20230612141352.29939-9-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507207164751024?= X-GMAIL-MSGID: =?utf-8?q?1768507207164751024?= 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 --- 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 Mon Jun 12 14:07: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: 106608 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2620415vqr; Mon, 12 Jun 2023 07:15:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Kppj1JGnPQymsDYskOTI8qkzGO2Uq2UUQqeSkCu9Y1y/sRWj2DOKA+pwuV8ZZhyYUpqF3 X-Received: by 2002:a2e:80c9:0:b0:2a8:eae2:d55c with SMTP id r9-20020a2e80c9000000b002a8eae2d55cmr3180582ljg.15.1686579353086; Mon, 12 Jun 2023 07:15:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579353; cv=none; d=google.com; s=arc-20160816; b=qG9v3UES41HU6bTqMvLPbdLcsU+cGO2C/1N0QC93z6sqI9Iqu8XbE/KAW92EZcj0Xs +o43P67yfg4CBcGb4Atjr3EOr60RNNtPWjqZGzsw/wkOZzIzJoVsoGYzHO+5wMM8V/9L x3qLPN7gCjUZprYBj/PLB2pmWqOnHGnOR8bwMkFfG8OMGj83aXGBgufCZvRCjLUA0woS RyxfylcpHjJ05NOJFvb8A19P8bHc1fX0wyf5sbrwJyptQUCzNJxrWsw1z3TP6cw3/n1H cmZC1UB5dT4/aLz2EZjc04oIxknkNqn13Gy9UVH2KV2zGiUD2QBvB9aFH3kIGQ7ZLqIe jKKQ== 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=EhX11v3xhAS4lpyLHOu95ewhCONPfJzHyC0tG2hvu+8=; b=HMnBJC2ffwv6BOvCRXDwFGb7hrJQv4QVl1p+quXkceExgL9hXWiCPkvOGdppKufgYN JnPoqJAzyq4ZLkYNdXyGhou4y/KOCMfpCFqdAe+FaCJHWDL0elyKEBJKDNmRcSzxhKSi 4FICOMD/UHFQ5715XXZuQ+JyC/uZMVJrLV3vj91/xWHkg5mQSti1hVNzMN+GA3EYrojK 1XErHxSrXZnwhJ7Fe1+pQgwv9jhxur2Az3Mt2wswIuRUMbu9fsf7QFZ8qQx4fzjfFkdH EsfDfHC7yGL7mYNJjRi+PyBDiU53PmYd574tNS8SoNZ39/CdFzhz3aqtuTSTp+e3CrgU AL8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="k0h/AQn3"; dkim=neutral (no key) header.i=@suse.de header.b="DaoKM/63"; 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 ha13-20020a170906a88d00b009745124453csi4986317ejb.815.2023.06.12.07.15.22; Mon, 12 Jun 2023 07:15: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="k0h/AQn3"; dkim=neutral (no key) header.i=@suse.de header.b="DaoKM/63"; 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 S237340AbjFLOO3 (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237282AbjFLOOA (ORCPT ); Mon, 12 Jun 2023 10:14:00 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3967EF0; Mon, 12 Jun 2023 07:13: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 CEFC8203D5; Mon, 12 Jun 2023 14:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579237; 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=EhX11v3xhAS4lpyLHOu95ewhCONPfJzHyC0tG2hvu+8=; b=k0h/AQn3ulq4fJqWuASei26YySfG7Gb9Bc6fXvFyRUCbvcDKnmSK8xz7tIWEQuEFfHXE3/ Uti9k8xKT7AiWbtkfUWSsQj4BL6Vsnhn07J1EHoPFC0uV35XHe6h2nIrRGe1C3QwS7lhji oxmTGnePZMIh4uY+0l+h32XQEMYK1vk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579237; 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=EhX11v3xhAS4lpyLHOu95ewhCONPfJzHyC0tG2hvu+8=; b=DaoKM/63/Zu2UQ3GoGRpA5GROMnfH8KNosfT91Bi9zrS2uPpnAHXPPbhVsQDzvVZ2l7ZbZ kX9uNX25xZ51eLBg== 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 820331357F; Mon, 12 Jun 2023 14:13:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yO/iHiUoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 Subject: [PATCH v2 09/38] fbdev/aty128fb: Reorder backlight and framebuffer init/cleanup Date: Mon, 12 Jun 2023 16:07:47 +0200 Message-ID: <20230612141352.29939-10-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506631642832953?= X-GMAIL-MSGID: =?utf-8?q?1768506631642832953?= 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 --- 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 Mon Jun 12 14:07: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: 106637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2633435vqr; Mon, 12 Jun 2023 07:36:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Jn44I3mFETmTZ3STLef5lu4EdRdnEVEZtBBiL8j32Pr3fK1cOMal2cTB1Y7qR8EqxqSky X-Received: by 2002:a05:6512:411:b0:4f6:2020:7c24 with SMTP id u17-20020a056512041100b004f620207c24mr3798793lfk.5.1686580576404; Mon, 12 Jun 2023 07:36:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580576; cv=none; d=google.com; s=arc-20160816; b=qMiR/5aIiRh6dShXWHpwuKIf8/rOkAC7PYdg4W50rX2+C51odfOpO6mrKNq1rDHPIi B9LDyHd1rAJOtGeCr2Qw7WJ6rJ+cOMqhaG9WHYdFlfoFm+IY1VuQDf08jc+NzQYeuyKp cMzQUMbDrlUrSvb60lgyJ0OONsYq39Yod2Zw71S4M8+RrcpBLVdoso8qGMQ1B/M8klFW fSdDRleheEOXYH5U59Il2CdzgZQjEmgYDXzy8rRtzspW5uj4IerTVyWPbt59XZMTf7c3 LKswCPlgZWIfVpP0BgMxIPWhpPmFc72uym2vmqDQfWhABxRAI4id/149mGTCIcnNvdqU StAg== 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=6kaVCNj4tgN+z2DdqslCQwj9/KoTXQV8PSRO8egtdwg=; b=ADfFmE+tv5x6O1V4N/mfE+pSm7J9eK1L0Kx9dooCqj9mUyJpZKmT1fXVF5WGea3hez e40YFXHcdUJbCamGTjFQWn5mOhs+l1Dh0CIOTsM0r4Axnq/tNLmNkgP6Yuk8km6c65nX X6fQlS/MOp/9/2wOjnA//gmCj57+e2c6oFDUSs31Eey20Rwfk0bJa2qJpJTmp4WsFfdZ cvrkunrqkCbSNEiVQSIZ81wvXjCdXzIYxG8+fJ9vt+BGroRJdF25StChPm8Yieb1syqy fFZhDwVXgToruCaHuyEupwf96Tfxa0wLX5rrZPIf+93ca2pCjHRQJTQ/J28Ij1aq4R7l v2mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=TUsdTAYg; 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 ca12-20020aa7cd6c000000b00514a032942asi5621351edb.542.2023.06.12.07.35.50; Mon, 12 Jun 2023 07:36:16 -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=TUsdTAYg; 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 S236827AbjFLOOl (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237316AbjFLOOA (ORCPT ); Mon, 12 Jun 2023 10:14:00 -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 9215810D9; Mon, 12 Jun 2023 07:13: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 31693203E7; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579238; 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=6kaVCNj4tgN+z2DdqslCQwj9/KoTXQV8PSRO8egtdwg=; b=TUsdTAYgmS8pspPnsXIEh8X/Q6hFe1+kgCRCx0cJ6HUYwaxplYsxI7KxIcSv2gk1WzxUCM tkixYzDw8TI8VjyqX7mSHAcHknZ+W4XGL4Kb7X5C/W26lmJTdeuW/lu1OwzMfFvh60xGPu TU9c1g6qtcGNROkxe/o0SMuLIJDy9Vs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579238; 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=6kaVCNj4tgN+z2DdqslCQwj9/KoTXQV8PSRO8egtdwg=; b=eB6RqgxueXzNYsaF1Y3a4zr0pkYjM/24cfOxXsOq8/07BOeFZ1+nrTHTM01B4IJuKY+Ls3 9RGhQD0zMxMTIaBg== 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 D4BBE1357F; Mon, 12 Jun 2023 14:13:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mG3+MiUoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 Subject: [PATCH v2 10/38] fbdev/aty128fb: Use hardware device as backlight parent Date: Mon, 12 Jun 2023 16:07:48 +0200 Message-ID: <20230612141352.29939-11-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507914681104268?= X-GMAIL-MSGID: =?utf-8?q?1768507914681104268?= 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 --- 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 Mon Jun 12 14:07: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: 106626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2630072vqr; Mon, 12 Jun 2023 07:31:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KUNWDag6TdnjwFRMx5AjCotqCn6Y9smua2ljOqJcZwqhy+m/aIeQXa5E/cIcPOw82rNME X-Received: by 2002:a19:4347:0:b0:4f3:b2a7:68ef with SMTP id m7-20020a194347000000b004f3b2a768efmr3703542lfj.10.1686580275499; Mon, 12 Jun 2023 07:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580275; cv=none; d=google.com; s=arc-20160816; b=cqUl9q6kwTNVLQd6+MbFqXZkQ0wK7d15y7+KLDEa6P0uNcL6yIhtbzVV/H4LDhE1Q6 FQL8/fYjiH0RHv0DB5bMF0OqBACBKbv4ROjDL3nuSMdP7IdjdXs9UpC8wEZqEvYYj3If CNTDo73GxN05sHCyeXxN7uLscGnziBcN/PrkgXLUoAQlWJgWR6Bw7ukMv1I7vyMfC3vU 6V1VNWkp9zxxNV/id5Qldm/oavYyoL7e/be0AeYVyM+6tQzmzipBjtgvpiX/CVvKUUN/ 3TU9ex9pLkLCCWOUafo22xaP91VpaVxNb0et0QQxTqLogXYETwncDXhw5vgLMSz0ic4v dCDw== 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=LdFYt/qoASITAY52DE6HZWdcNBV1SGXn2DcIPAfGew4=; b=dMYmqlS8nPca+bsZN4INTnfnjSnrtqC2WXv0aFlBf2fBc23wvMS5mcUXqItSMozk5x avCyOxxvWHSRwmHH48jqtjTt0eGjh5nyvNXHWToGbSbjxhoCRgjYbXnZbqrG1GJt77La BJDCiKGBQWw/fmf0ZT/BbLkMtH5CHlX+vk08zZH1j8re2VarK801X72NSxGKYprPY1jH ErDMgilzL5o93I+KsknYO0AQJW+7bnl7RCz18mdnEDb3ei9mp0tcHpQwYfYieyfklwZI qczl8t/yOTbOJpKBpnwgEu88z2fIWVcUYjS8BDw8xu0sYKKIdX7MNYEDB68ll9gnzswX zXkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="App3xnd/"; dkim=neutral (no key) header.i=@suse.de header.b=cVlodZvw; 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 e23-20020a056402105700b005186d4fd448si59905edu.575.2023.06.12.07.30.50; Mon, 12 Jun 2023 07:31:15 -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="App3xnd/"; dkim=neutral (no key) header.i=@suse.de header.b=cVlodZvw; 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 S237636AbjFLOOf (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237312AbjFLOOA (ORCPT ); Mon, 12 Jun 2023 10:14:00 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D917710F7; Mon, 12 Jun 2023 07:13: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 81C4020462; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579238; 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=LdFYt/qoASITAY52DE6HZWdcNBV1SGXn2DcIPAfGew4=; b=App3xnd/PWP0Xs9iyWZuToNef4BTZlbLklZguTbxU4RJC8xXv4JLiO9FRTtxnZ1cEYtEh/ 3WV2Ep6TB6tCCdrFtcGpZf8iqaYD+mhmjYasnC8dELJYzMAobZ44gVC/OgnAirQ8jAc8Xn pWWh3RuXpclvXmwe6HUCnCJg38am17Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579238; 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=LdFYt/qoASITAY52DE6HZWdcNBV1SGXn2DcIPAfGew4=; b=cVlodZvwWfCYOUvMHommz91hfORQOgDv3GTcQQ4PR/S7Yyrt0yLFdCFWheikmqenw7RhRw OH0fG1axuLAu33Aw== 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 363FE1357F; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YOo1DCYoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 v2 11/38] fbdev/broadsheetfb: Call device_remove_file() with hardware device Date: Mon, 12 Jun 2023 16:07:49 +0200 Message-ID: <20230612141352.29939-12-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507599049679887?= X-GMAIL-MSGID: =?utf-8?q?1768507599049679887?= 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 --- 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 Mon Jun 12 14:07: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: 106625 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2630042vqr; Mon, 12 Jun 2023 07:31:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6yOSuJOcHM/A6Q3PnUZGjgUrZtIp+WvZuXrWnk1zzR9i1a+opvk4JpPGTICtFdZqwgae8c X-Received: by 2002:a17:907:728a:b0:979:43d2:fee6 with SMTP id dt10-20020a170907728a00b0097943d2fee6mr9230597ejc.1.1686580274760; Mon, 12 Jun 2023 07:31:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580274; cv=none; d=google.com; s=arc-20160816; b=kOhIa3Mhy5QI9fXEi/zx1svhwzrqS9OcRTZmcGboCbB0pgkjwkQl19ULqowqNuWoTJ J34Vw92Y0B72lJZQbM6M3PClrUSuoIHFHXQSE9maYZhd3HxIpXMkTzM1ifUfR1116DK1 DUlxuCAEt1Y1pyaDlL6XoIf6d5G4ZF+pERCNL5ZuTvB5r+C1Z/NF1s+UX+XAh/Gfnh1+ QVrMxHfN/FsqpPBTAWqwTdv6wW3CeYV9J5hH5d36F7PeFspah5NbrxR9adLIU3/F/RuM REzhyI/N32xyiZPOf0u96upy/EJVKsHBS2vkDUHQ8NpyPauBCkVIe4YVglR0rETX/qcj arjQ== 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=d7rFQu+NiHcw1ptzrK04TTSiymT5fsyh8oWCKcWj7/kEXG7AIiwoLwZPBqcymsiUXm /VrYuTcI/GW0tITJYdhhqQp0WYyb7wZ0mJ5iI6b15aQpyplt88XzppZbpba3vZFYB1mM D0uufXz6FdZq5jLs/R64smkrdVz6Ok/rYiDOkS1brJAEdf+61XjOXJT15iokYTYXi0W4 vVwXT8B8M3DIOdcx339YMZlwUpKIZkZ5c0G8NYRiGPt/d3PCypvZiDBEARWoK0wVdrTn kXestnj3PmF789LwTO5GqaHyiknHZHfwOhPyPTCqkz5EL/G+rXXB2xW8GruCZWmMfucv h/HQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=piT0tDi1; 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 k18-20020a170906a39200b00977cf6fe2ddsi5631214ejz.531.2023.06.12.07.30.49; Mon, 12 Jun 2023 07:31:14 -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=piT0tDi1; 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 S237808AbjFLOOq (ORCPT + 99 others); Mon, 12 Jun 2023 10:14:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237341AbjFLOOD (ORCPT ); Mon, 12 Jun 2023 10:14: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 7658F10C4; Mon, 12 Jun 2023 07:14: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 D2F6920487; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579238; 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=piT0tDi1k9GcInx2VZawxHTEUmo2GUSb9G3n/TbHXMhvuQlgrWIbbSpC7QeLwMxNIAN3vk BKMMEeXRYEjhnYn4InzLNw8mNeIFW69LpZJDyVZmXFtHFva0ZIgCP0vBU6pkTiC4UgL7Pb BFmZBmsSL1PCA2RFkGUhpZComRzERy0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579238; 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=y7enem/ailjQhCZUOs9GcJ2zdJtJLqZ/6l9bBay5RCU9uOv4oi3yhizKOazmW1ooU9Hale IG3q1iWDXJNUIdAQ== 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 86A4113A67; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id iKDkHyYoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 v2 12/38] fbdev/ep93xx-fb: Alloc DMA memory from hardware device Date: Mon, 12 Jun 2023 16:07:50 +0200 Message-ID: <20230612141352.29939-13-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507598470247983?= X-GMAIL-MSGID: =?utf-8?q?1768507598470247983?= 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 Mon Jun 12 14:07: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: 106648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2636890vqr; Mon, 12 Jun 2023 07:42:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7wcPgRqraM78CXD9JMhTGY2+pZTZdsXGJh9NwTmAVxJe015W4csh2RB4fHvOkBJyOJV5/R X-Received: by 2002:a17:902:d2ca:b0:1b3:8aea:cac8 with SMTP id n10-20020a170902d2ca00b001b38aeacac8mr6791994plc.49.1686580950520; Mon, 12 Jun 2023 07:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580950; cv=none; d=google.com; s=arc-20160816; b=GEvov9Qq5TwB3/LsW3JLpQWjsty/cMPkli60jZv61sCZFHgR1Oyp8arRuSjFT4Y+ot +i1tBwa1EQJ0e8709ZDXBm+av6j5Xd1NBcu4AeiAjHd4Okd0NPELVN1uYHU3SyHxzEtJ WPXophcOjNi/Tw8qqguBsa+5nu8PIgEHZkN4H26RuWBPp2UVxXdufZQpyjak2SJOhbpo Ql1M76Acwecj0QSF6yC8OFYGABin7+LZFUc6W1YC4stcnw3bRxgMM13fLV7S7Zilc79F reLKyv0VkbfJ7d8KMiMAWDYl0pbJIJzEFxYvo7EAJW6A0p8WjbKEULg6WpkVsWFso1xd cMHw== 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=OR02NEwUSP8FXSon8tyHmE/KyIqGUhG5N2y46Bi62QI=; b=Rz5ObnGx51j2AzcOzdHxyujWbsQt4FK7r+V2Cqgk20ptKTdjftkozRrkwGEobREcwz 9R12ewxMv1v/xEIKGhr6282K0vKFFfDeZdSx7/HoqHZzH4F1LTINMqDhFkaI2+/WQbRg PsfALz5Fdtwi1yIE7hEHoITCqy7G/5xymaL8XGFQs4XnHLKH/fb4ONyp3bqcu9C81BWa XVCvcevKIeCCm/9komlTLaq2j4gHkiQW30nGG9SqEDoWrerW2Tk6ZbNtBj4c73+mEkn+ VlOZzdKsicg2Pdz5/xsFyMSlQSWJe5SB5ZHYI1B+ge1ocs5pUrZAEwS2HmhmfQRbQmK+ kUTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=PGUDPPLQ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=CDo5uM75; 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 e5-20020a17090301c500b001a67a19331dsi6940826plh.202.2023.06.12.07.42.17; Mon, 12 Jun 2023 07:42: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=PGUDPPLQ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=CDo5uM75; 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 S237489AbjFLOPJ (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237360AbjFLOOG (ORCPT ); Mon, 12 Jun 2023 10:14: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 C88B6118; Mon, 12 Jun 2023 07:14: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 2F0AE20488; Mon, 12 Jun 2023 14:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579239; 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=OR02NEwUSP8FXSon8tyHmE/KyIqGUhG5N2y46Bi62QI=; b=PGUDPPLQJyP4JFs/sdYWj+CCIstuX6bgaf5ORDYocKXzbjHhPR0A1OapeYuVd9U2PyryaU Uysf+xPcg2I0Zkbe47sVSDDnu2lVEWi2FOcnSS/cTyBAu/pvki+SbOmmdE68yEVxUzOXTE /Uwygzp0t3D4wGqS5X0nCUahj0u8QPU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579239; 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=OR02NEwUSP8FXSon8tyHmE/KyIqGUhG5N2y46Bi62QI=; b=CDo5uM75qTl+mVifu8X+DIqlj927x4k48L5XgKoXLWp21u+DRMKl6doQcEnxc1XwkrQE83 T3M4wuMoIoydxwDQ== 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 D762C1357F; Mon, 12 Jun 2023 14:13:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0OPHMyYoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 v2 13/38] fbdev/ep93xx-fb: Output messages with fb_info() and fb_err() Date: Mon, 12 Jun 2023 16:07:51 +0200 Message-ID: <20230612141352.29939-14-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508306503946132?= X-GMAIL-MSGID: =?utf-8?q?1768508306503946132?= 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 --- 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 Mon Jun 12 14:07: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: 106647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2636874vqr; Mon, 12 Jun 2023 07:42:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7MRg/M+AhnOXuH58AG49IsrFOFiXUnaAqvexVw9pdMBVDts1Na5NguY6vR933WFAT1OthP X-Received: by 2002:a17:902:e744:b0:1ac:86b5:70d9 with SMTP id p4-20020a170902e74400b001ac86b570d9mr7722103plf.32.1686580948346; Mon, 12 Jun 2023 07:42:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580948; cv=none; d=google.com; s=arc-20160816; b=zOs6aZ8Zu6VfyFXO4aBZWYLe3hKz3Bq3JjMq3Qj8kLtqnDgZ3OZFuXBvFSs07GtpXD 6mx4H7tN8UuxW5EKwo3EbHafGVlQTMQbD3DcBFS3GyU5Sj+fXgI2gxJnzxpB7BIXAInw pMjo1nOf2HL7vYddbQ3q6pnHMwbGcZrjZBvRj2mpC/wZUPPfKRX4wUHeFXqWEiRTWMVO OxXnPCHqZvQAX5ynA/5jeawrfpY1jLpIiagk2cZR2sRh8Qok9sftcmq2M09XpdejCuJ2 BTJ1sGEt7pDrLeMLDo0e1N5ri9sOPP63JEJ0mmmhw6pWDAuDgcgUKbtEX2QGKomuiFjz jkNw== 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=5XlFuQXVEDYri1l5bqNadN5WFO/7K04QREToOase7Ps=; b=mfOurL15N4zXpkAE/ljHFBvTC6DLHh1YLyFIE1uQHXYy3cdrDW9voGFTq4Vg6TNpyy cYGTuMm3oGKdcLaX2ABNYUcKBJ8dteGhRzbncWlGth8XVHhtrEKSGT4/K5SWOF9DEZuS avKCKEjH9zYWV3AFxh9KnYLCzXyezS4J1J4ZB7bmIqAVToZNvhdhv92Mh1LOySrt48Yq IsNKj8fV34oVgieAG+heRrYA0qZiEm5UAVgGl9APcmTMbDv0epYHy3gFtjXxrcOq/D7X fUuzGmY0tEvZVCuN66IufGkWj3j+IPYi+dbEdkPLSWdbG6zjD9UJrRE88OJ9Iy8tnW78 uAxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=YELoukMA; dkim=neutral (no key) header.i=@suse.de header.b=NvP+v4zO; 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 s10-20020a17090aad8a00b0024e3527e8e9si8589800pjq.9.2023.06.12.07.42.15; Mon, 12 Jun 2023 07:42: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=YELoukMA; dkim=neutral (no key) header.i=@suse.de header.b=NvP+v4zO; 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 S237699AbjFLOPA (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237351AbjFLOOF (ORCPT ); Mon, 12 Jun 2023 10:14:05 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAE3210D4; Mon, 12 Jun 2023 07:14: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 8883C2283D; Mon, 12 Jun 2023 14:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579239; 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=5XlFuQXVEDYri1l5bqNadN5WFO/7K04QREToOase7Ps=; b=YELoukMA/BkLxCHOiUsNrRK6rtuEwABy2ibt67n8OBECyHcnC+40cUyDoZoTUbUpm6HOmF cg+zK8kPoWaNckCOEXFPhsJQaihjWWhiz34ytE1c/U9OezWAoQTlNDwlpxiufaRH0nqe5B 9jAsNimFDMl4HQuJs2cLXOyvSZTMOLQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579239; 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=5XlFuQXVEDYri1l5bqNadN5WFO/7K04QREToOase7Ps=; b=NvP+v4zOyBFQXazhe6Mi7gCMeDRyvKnEfoCeGaIrC/NW8GYpI/tgRBqSJtX5LVE5Lb50j9 mOD19hEG0AGHchAw== 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 3478A1357F; Mon, 12 Jun 2023 14:13:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kKrrCycoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 , stable@vger.kernel.org Subject: [PATCH v2 14/38] fbdev/ep93xx-fb: Do not assign to struct fb_info.dev Date: Mon, 12 Jun 2023 16:07:52 +0200 Message-ID: <20230612141352.29939-15-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508304123749778?= X-GMAIL-MSGID: =?utf-8?q?1768508304123749778?= 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") Reviewed-by: Javier Martinez Canillas Cc: # v2.6.32+ --- 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 Mon Jun 12 14:07: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: 106609 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2620951vqr; Mon, 12 Jun 2023 07:16:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ54v6wR5d3osCJEpyUG0ahYEaAoy/yMbRFvbZr7n2OeBzTRsQxM5JuQgrnRNGCZ/YeocGUA X-Received: by 2002:a2e:8082:0:b0:2b0:360f:5752 with SMTP id i2-20020a2e8082000000b002b0360f5752mr3165517ljg.2.1686579397922; Mon, 12 Jun 2023 07:16:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579397; cv=none; d=google.com; s=arc-20160816; b=x05zh4BmkAWchWhpCi1U4pVIUmXqSxkoJqL8z+aKcmeGfkLpOMn/SVBLYKTS+ERU7d bP3is7C3KPxsqp0geFhyj+2fEdxSNO17Uifa9hgGzUIw89sEGWYfSmsYvTbNLpQPw2g0 wbcynPDrJrTPWvfT7/rWNZQnQUcJ6E1xWxc8oJQGijCpYfH5VTtkgmuaALJMc2wmeRlJ uWVCx7hE7a2WclUD0J/gv/7a5zPDVNY7Hx/lIMYcn5TAFaok3adp2AmCD+iqF+QJ5Wsm ttFYWhwxjbzYlCvz66jJxP0ffbq93blc7NPDXoNC9rbnI8vJTcgL5OTSjqGd1lPnb95C F91A== 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=n/1XN16d/EUe3Vztuo66YMXwHZvuf+6H3H5dWkYxYdo=; b=P/I1thMkabUWfC7mF1Z1SVcyBHggTGtk9J92Z8etR0+ksp3T1nk6gq9VmBmtlXXc5p nzIKCmbqopfCABhz1Lq1yUlQ7nSIzw2CxA+BWPekG5g1r4RcJaoOW5zKEeu8UshFhSKe IzUfTtPWef+BFZaOZnxl75/19YhobtA6KAvRrDYoxDSfDGhis+0GVC/dpkZrkN+VQ1w2 LEnv9Q6hmy4XFOKqIlwBuq/rm5UJ3kPG3jaIuc8+6EnX5OasCliKubVnigX+PmisVSPz QoJ4nDcBLxEx3/h508tzxCqYpUDU7Sj8yUS6dA+uDBuAsXdeyPHvEoe5Qw8OuIGFTIqc nT7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ZP/yZZWs"; 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 n4-20020aa7db44000000b0050bcc5f4b4dsi6279796edt.167.2023.06.12.07.16.11; Mon, 12 Jun 2023 07:16:37 -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="ZP/yZZWs"; 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 S238101AbjFLOPF (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237359AbjFLOOG (ORCPT ); Mon, 12 Jun 2023 10:14:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4505B10E7; Mon, 12 Jun 2023 07:14: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 E507620489; Mon, 12 Jun 2023 14:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579239; 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=n/1XN16d/EUe3Vztuo66YMXwHZvuf+6H3H5dWkYxYdo=; b=ZP/yZZWs+DOWuCywBIiAuaobu2jli9K5UE4idFPLrXAl5T0MeoNnOCkgAyY93JjZwwyyum XXopghqrv8jMpgAbGUlFBbW/Sqfkjn87IKeMjuU8Zx5YHOFjyjFYVoBe3i5JKU5BbuuOoB bscf0mozfKpcVnIt+72gLxcD52ws9/Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579239; 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=n/1XN16d/EUe3Vztuo66YMXwHZvuf+6H3H5dWkYxYdo=; b=sMGGv0y9AAQWFLgwOkfLiT4QtCPeUXfL1RUZGdRBEV0WC3NgWjNsOQAKTHMdtSQZDggzPL iRTXmRjpcTxTHUAA== 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 8D0EB13A67; Mon, 12 Jun 2023 14:13:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qI2AIScoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 , Timur Tabi Subject: [PATCH v2 15/38] fbdev/fsl-diu-fb: Output messages with fb_*() helpers Date: Mon, 12 Jun 2023 16:07:53 +0200 Message-ID: <20230612141352.29939-16-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506678525300370?= X-GMAIL-MSGID: =?utf-8?q?1768506678525300370?= 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 --- 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 Mon Jun 12 14:07: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: 106624 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2630018vqr; Mon, 12 Jun 2023 07:31:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6LrNPVh7XgKE7poFF9ZtMIAyjqd+3rkvt7KsdWYBV8oFjP/nH8fFdpPyZNfkASBTWjYgKS X-Received: by 2002:a05:6402:1243:b0:518:6a48:e21a with SMTP id l3-20020a056402124300b005186a48e21amr374640edw.26.1686580272768; Mon, 12 Jun 2023 07:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580272; cv=none; d=google.com; s=arc-20160816; b=lazb5VnVUMZB1Vs2MapnHGUkIJIcZkDgosHGnSVJ4Ua7dZD1RBTmpSd913U2LqMF69 hleX1kCbYieaKYoVinH1lnRCHhwE6DSaAdxva1S8deQktxM2epBKKoYj87hfUlpRRFKy ByTGWI9E9RVriPtIrWFckMt8IlHK0IilQaoBiQ2ylnO658uxu8XeqbbZqT72nLWlK24R Wo0aSu0H0psbeCKK66yjG4UbWKP7Ht1o3X/4shs3ABCz73faTFnadr/N/DphkvWl9Rxk +9sSmQH3lhkiaTY3UEOcLdesWDHvU9ZiABPgsF58cRTIxyAxDMAgWf7jCythwNx8IdXU Ufjw== 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=KHaIM1mXVDYd6HDF2qJug1/atoNFlj4bYCqrjFZko5Y=; b=qf5ZERdTOgl9VnXh1wgZJBD9X63pUD3Wb0/amHTy463/sX2WIyQ7OM6HMRd8j1N915 X2NDy8LWlYkcG8BKK/7tOmVg6sxhJjiAgpFnm8+bKk/9wCjZqlDQNA2/yxM+5wWd1tS3 mmefkhjNHP06JbM1rryjckWwYfVEpgRtzrW7DFYjx4sbFpDtxOZtkwJwwF5D0oKw8Mi6 e/i3Jb3bZe17ZN78wzuYfs6E3UB1Vi08Xu3j6l1aZZm3oGYHaW6sUeUxSEfLdr8SxNsu IJ1KbJiHlzIiyVV2IxhOMpVU00Pcr/BRAgbv7qhq4kWffzSsnUAeu+AiPWn+D6TG235t LBlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Hfg9XyMW; dkim=neutral (no key) header.i=@suse.de header.b=2gstM1tX; 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 m8-20020a056402050800b00514be2d0c68si5864250edv.629.2023.06.12.07.30.46; Mon, 12 Jun 2023 07:31:12 -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=Hfg9XyMW; dkim=neutral (no key) header.i=@suse.de header.b=2gstM1tX; 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 S237399AbjFLOPO (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237364AbjFLOOI (ORCPT ); Mon, 12 Jun 2023 10:14:08 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BD6210E9; Mon, 12 Jun 2023 07:14: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 459BC2048A; Mon, 12 Jun 2023 14:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579240; 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=KHaIM1mXVDYd6HDF2qJug1/atoNFlj4bYCqrjFZko5Y=; b=Hfg9XyMWEfJlY7hQ0XQ/MkPgs/keqC+BODstU1pFrBJ20k3oCU2vXIiqhaONvM99eOxkN9 ZTQrDR8dR1nA062/VTXlI1bqE6aExK3nh76QNDGxlBXyuRNKt6mhsQYRjCcz3SquMYySji mAWUnW6DgtT3YnEpA0DiLZfyuhRR3hI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579240; 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=KHaIM1mXVDYd6HDF2qJug1/atoNFlj4bYCqrjFZko5Y=; b=2gstM1tXyQwjgJkTl8TkAoq1ZTddQJBL/3EAyI1iDJduEm0+2MSFbRe4hZUTNVigjw3ixi sVl93A3u8ve2X3Dw== 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 E85621357F; Mon, 12 Jun 2023 14:13:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eEPaNycoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:13: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 v2 16/38] fbdev/mb862xxfb: Output messages with fb_dbg() Date: Mon, 12 Jun 2023 16:07:54 +0200 Message-ID: <20230612141352.29939-17-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507596191087646?= X-GMAIL-MSGID: =?utf-8?q?1768507596191087646?= 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 --- 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 Mon Jun 12 14:07: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: 106610 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2621176vqr; Mon, 12 Jun 2023 07:16:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7c1Psmir7k6ZswQDuG9s80gT5piW+TBYIfbiqoKT/x0nsgRCq2kp5RtG6xKhoGjnprnYxh X-Received: by 2002:a17:907:742:b0:978:6489:f9f with SMTP id xc2-20020a170907074200b0097864890f9fmr9519120ejb.52.1686579417837; Mon, 12 Jun 2023 07:16:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579417; cv=none; d=google.com; s=arc-20160816; b=rbVfkW5n07LEwTsMWIFoyLbYk7ZA6wwA1NiqRL8fE+ZtrHrobTI3yePRIIVHrvvih4 gZtVr1yna6yidFnK43lSYgwEPEL2moEphwHuyuVIm80BDT2IhrlbEF5vd19Ppue89xLI 0HWbAkuzufTb/jfgjS7TqRnMxiSUnE7zTtypdMZo9/ICd6VS36Db44o+PiX5vOqFqwSr XPboDEHV72pD+zpCSUgJqMc4BrtzZ1+m5tGIB48YoPPYYIxDLdUC2AL4VUuy6SsJCuvp miK4q1XG9Nq29RpQHCcA6rOtekR4nC+MhceYDzXZYY/VA2WbQcTT6R/xinhVM1AYvi6V itOg== 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=PbUjj/PueO+Es73bAqXH5DD3UCVS6BRl+fKU1vkiyGY=; b=rQa4FZk54d0dLk2sNp+qMRwy89LnwywSPWmtQOlUf8wDocNntV0JHyGgryuLwH2GGV +GMgpFx2Togl0Yk+ud6i95SF15EzqyUIt2DWf8KXj+ZyWbm8fETUIMpHj4XlbeTgrQbU odZ6xzEgiKBT/qhIOYgcBL0D7WNkc9qfhVr8LxVlakqWTSgBAF+owLJzVMmkipavqKf4 9qWx16lVonYAgBHq4J9lqzesibOqvXbG6G97RKdkCGtcCe+Avq88fFB9G5oo4wHpdIzA /mPP6OFr87H9f8l5fSeBOIvKdubruD8DmgveRw0l6weWCkllWy7n/PIjT5/+57I98lrg CjAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KEJxLICd; 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 q9-20020a1709063d4900b0097e4824e1dasi3216577ejf.526.2023.06.12.07.16.32; Mon, 12 Jun 2023 07:16: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=KEJxLICd; 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 S234145AbjFLOPY (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237373AbjFLOOI (ORCPT ); Mon, 12 Jun 2023 10:14:08 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2712510F3; Mon, 12 Jun 2023 07:14: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 9B52E2048B; Mon, 12 Jun 2023 14:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579240; 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=PbUjj/PueO+Es73bAqXH5DD3UCVS6BRl+fKU1vkiyGY=; b=KEJxLICdhH0tm46UM+vGa6MA1q5H4k2lbtjGIeYeHGiMAy5XIAQurXLAbBIeDClzC6V6nV XqjzvBAeknCZEAY5CTfk34VoO1dFdI6LyV7pJzlophEfJatxJva0cxSBSxdfRbF22sl39z IGpqe4k5O1D/vXJUfxnIbwZKtSIhOX0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579240; 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=PbUjj/PueO+Es73bAqXH5DD3UCVS6BRl+fKU1vkiyGY=; b=TOnbRsF5IjIS4iot6RtRpIrgIU3/ZxJuA71pk2pYhnF/DMQix38TToCkmp8DZZ0hJx2XM5 I5U66om943pHYIBQ== 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 4B9321357F; Mon, 12 Jun 2023 14:14:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YJ53ESgoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 17/38] fbdev/metronomefb: Use hardware device for dev_err() Date: Mon, 12 Jun 2023 16:07:55 +0200 Message-ID: <20230612141352.29939-18-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506699833166439?= X-GMAIL-MSGID: =?utf-8?q?1768506699833166439?= 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 --- 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 Mon Jun 12 14:07: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: 106649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2636940vqr; Mon, 12 Jun 2023 07:42:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5I9vDhO8Os37V++ywyFRJGkYrMHxd/v1bvyug9yf1eyTACFWRKRoUaKtKnF39Acns7Gtil X-Received: by 2002:a17:90a:c909:b0:25b:ee97:5f7e with SMTP id v9-20020a17090ac90900b0025bee975f7emr1734663pjt.42.1686580954152; Mon, 12 Jun 2023 07:42:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580954; cv=none; d=google.com; s=arc-20160816; b=BgKEUOEhYnlHolTZcpNvPUHK/XJjNiwPIIYRvLI2EQ9Jmo347RgaAh6oPaCmvgMhoe c7LNeDO4YoCJoWks3WtT9F2+9nvL3oGr2PAjWr+N26aFmOjz5Af3euibt2zDvxHqa4lj t6j67x3M3/q5vL1qhbra0pedWMBAb0q5SxPtR1D9lJ0VtsLReeM2Q1pcGINUnucmxOut x40GijFVMb9ngPLGFouYfZ6q6M46HKKw4ecdIJ2op+Sa2dsQ3SEKUsBzNm+6wvG3wTgR UN54hMY17BSpeDTctocy0HIteMrhnK2CpgDiJNUgnQJLxr7g9oRMHulIYgTHYXF17mzu Wz4A== 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=4C46o8uYDdrEdTWuVBPChdiMr7SKVkGgLXmMwmSf+iU=; b=Q5V8GwaJiIXyV4EhQnysVQ/eCdyfXuSTOhUbWMXBlTiVnaKf+kJjpoh2nVgXRq0840 jlybAR75Yfyr1MvqnovIpwtQZ0B6AiKIESw7irARiWniBSCfy6WdvK4/Y8WeZWu718Kx sn1sTLV35JUntz82RBz7waPbldEJaoJkNvO/pCZOq6G2FOMTivwLkyJc/MvaDaTLpKDy T0B3a918gRtkcm9m7m5bwxNa/dWc44SGBNARPq4cc/jgadqaa+NltX/fyd7HzNhnBl0v zrcNqwQEm1rOLzw8dTILwdGRI8vwgymteKIl1lf11MoP0dxG0i4m0SQ+TmEdeLZT4D0Z U8kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=kzIVjaEq; 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 nv13-20020a17090b1b4d00b00250331e6044si4694841pjb.25.2023.06.12.07.42.21; Mon, 12 Jun 2023 07:42:34 -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=kzIVjaEq; 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 S237707AbjFLOPU (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237377AbjFLOOI (ORCPT ); Mon, 12 Jun 2023 10:14:08 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A90010FC; Mon, 12 Jun 2023 07:14: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 0419C2048C; Mon, 12 Jun 2023 14:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579241; 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=4C46o8uYDdrEdTWuVBPChdiMr7SKVkGgLXmMwmSf+iU=; b=kzIVjaEqce3dAEaknrxPIJZ6lS6+Ya8hqQX3c1byB+YH0jLXNK64oQP4mxcjAaEe17tzMF /54DMlCe520D+fEa1qAjq5ZpYDiXizZMP+q9iTR+wrGBb3fxCyQoMkA6aV8KUqfVjN5sm3 yQTK0xPgy5xeK2MxrsmKWGfCVRJDUjg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579241; 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=4C46o8uYDdrEdTWuVBPChdiMr7SKVkGgLXmMwmSf+iU=; b=YbBVmDjgAzUdv7zuZTl3RcbhtJJDzUBE5FFcKWqKWE9Pvajj1QDa6s5B7Fj0S6k4nIsyW9 BrCZqArWSVN0mNCQ== 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 A20D21357F; Mon, 12 Jun 2023 14:14:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id GIuQJigoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 , Antonino Daplas Subject: [PATCH v2 18/38] fbdev/nvidiafb: Reorder backlight and framebuffer init/cleanup Date: Mon, 12 Jun 2023 16:07:56 +0200 Message-ID: <20230612141352.29939-19-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508310888293241?= X-GMAIL-MSGID: =?utf-8?q?1768508310888293241?= 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 --- 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 Mon Jun 12 14:07: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: 106645 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2636382vqr; Mon, 12 Jun 2023 07:41:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XiHRqENQlyWUVV5pA1RLOmIf4iSQmt94DpqmBkfpuWKt4E+7LHigEUU8+pgibmWBzyfaw X-Received: by 2002:a05:6a00:24ca:b0:65e:fca6:f2cf with SMTP id d10-20020a056a0024ca00b0065efca6f2cfmr11509451pfv.26.1686580895063; Mon, 12 Jun 2023 07:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580895; cv=none; d=google.com; s=arc-20160816; b=bxu4BdLPP5Zm8TYCM34FgBOrKPZ4mc7pmxQzvBK+LGHvoCX/adCAonlJYkXDKmG/yU z9WyFX2oi5hWdElBSjVx02FTO73PP2FQDNIAJkxcPvlv5LQ5SSK0IoXvIv+tVIQRMPnU CagdX2M68AD/3LNafSB8eXb693RPiZr98vYa2BpHUefISsIOHRfPX8bwfO1BIPA2V+Ov 1cOW3ls4U8rBZA2dGGOvYv3UjrMO+4MzIN1Qa4cI3M1yWIKBzefW3BRHCd59pQIfSQEj z+Fwh01IyPRaPTh3utJcJLb+DHXq9ds2kOPV/a7QQqhBwW3EHf9yIbu7lUWiCwpER8EK X3Nw== 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=3bdWYG/63W1BkUsuYHUlm9wE73VCJDKGMcdHIDnt6jY=; b=LRY7PiFzgER0024C51aG3qglttfUwRNUXJXUejCJA/68cOlTIW4i/wlmtsVKuvW50w RsEe9fp61mTnFrrpkN3LY7Px55ex7R84dQmcZi02e18Fan17OCmUoNGvRGnwuctu/fuE eRS54AF7r4y/X+v1o2dHGd7SfRozj8Jlno6+RS/24yz3/oU4XA6YPJprOE3l6PJqQaka Z0hiGEVA6eLUBGmPjyDe4Tp8lXU7mvU0Pz8NGMg+7cqc/PEfg8UhG5nu6MndQ6pWHh+z 2UYH5X67WdHaqmLBx09wfLmfaGJg/ktDxb1CNNlreqzjGCgt16E1yTyhUG08WCJOMRgx MTsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=KZ3kLok9; dkim=neutral (no key) header.i=@suse.de header.b="yKEF/6tH"; 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 p8-20020aa79e88000000b0064f7150b45bsi6878133pfq.352.2023.06.12.07.41.23; Mon, 12 Jun 2023 07:41: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=KZ3kLok9; dkim=neutral (no key) header.i=@suse.de header.b="yKEF/6tH"; 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 S237317AbjFLOPi (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237374AbjFLOOI (ORCPT ); Mon, 12 Jun 2023 10:14:08 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAF2910FA; Mon, 12 Jun 2023 07:14: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 6029C22847; Mon, 12 Jun 2023 14:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579241; 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=3bdWYG/63W1BkUsuYHUlm9wE73VCJDKGMcdHIDnt6jY=; b=KZ3kLok9pPyWvpvCFoga7KFYTUq5ufKgeCU6xNPfcJr0CTGOAblmD/p8cLxTMuMOhqgpgR D3mNA8pkz/SYWGpG1dTp18FJeHz18SheYW/fR/3mLXsUdddKRyELjvPfexEnSsh7sDhU/e fPjK6dmlSTu5gMkvRLVFIMSAPlLR5W4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579241; 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=3bdWYG/63W1BkUsuYHUlm9wE73VCJDKGMcdHIDnt6jY=; b=yKEF/6tHn7/Q/JYD/0d3Uqvq4KoB0A0rwyC4GWCcBy/06ClCNz8jAp/q9hTJbXVKtepz1z r4EiGBmruAIE/XAg== 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 0992C1357F; Mon, 12 Jun 2023 14:14:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8JFtASkoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 19/38] fbdev/nvidiafb: Use hardware device as backlight parent Date: Mon, 12 Jun 2023 16:07:57 +0200 Message-ID: <20230612141352.29939-20-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508248624407929?= X-GMAIL-MSGID: =?utf-8?q?1768508248624407929?= 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 --- 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 Mon Jun 12 14:07: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: 106631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2631744vqr; Mon, 12 Jun 2023 07:33:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4R8lj81UWPdHSRfVMorRfKtCjwe1ucJDM02iN/RpcyiMzMuLY23b+UTGSfVkyIT1QbF78F X-Received: by 2002:a17:907:1b1a:b0:978:992e:efd1 with SMTP id mp26-20020a1709071b1a00b00978992eefd1mr8832510ejc.35.1686580414209; Mon, 12 Jun 2023 07:33:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580414; cv=none; d=google.com; s=arc-20160816; b=rOkMse5Gmws3BTigvu5c+IFvhgTFHiNguo2Rv4UB8SVwdcyMBEvzAGYmfUffyqsMqY w1XT5XAT7kweZEdTvwq63GcsPV4rugRUMf0Iwsorxv/2rNuAaV42aIpw3Bh1keP4VhaD F44nF2x4EmND+K/k30NzzNJqMtv/wPGglRyCV6Y70A2o+6WDl0k5OkYydYKxudrt4lB7 cScayDulQYK7u/DD1UDj3Z8jKCusp4l02XOVp4aMw2vAPqd9g7n3Fei7F2L5AeFv6n98 nNLwvtg3OIKZtoBhg9DXaV/RIfA3dlmBurksS4sAtybEVLdGGr637FyS1zb2uORbnjJR KwyQ== 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=NeJmBMc+qN1qkXnt7g1RgqrFwwNflzArnjihi3rx4yI=; b=ilXY9XSTtzgp4UVZXNTtBmbT+O7YESILQykHi8SWVWuk+3S/17epazq/IMaURLFSfK Bt5IW2lyuH82FUmjIVa6RuTzSnF62JBXwQSgKrl8hA8uvSqVp/Rq4AwUrPSrayWDMKzH dXmUgGpHlvcCME50oBt01m5578xKb92DPIFoQw081pv+/8tOT9wCqdjuX/aBQ2CFbKoJ q4BrVSO+9du+UPXf9h5uk9BmbDjPXdwr3b6ZDWndkiF6vBOWxZstLWQR820ZnmsgdJm7 Z2hHxJffWRi/n/0nhzLjI0zhB8wU8mgNV1Cnjd6t5e6GBSxdZ88JYm1bPOs+jboCm6gg asIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=gFIK1qv7; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=UZGQhraa; 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 gv11-20020a170906f10b00b0097d75ad0dedsi2446876ejb.282.2023.06.12.07.33.08; Mon, 12 Jun 2023 07:33:34 -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=gFIK1qv7; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=UZGQhraa; 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 S237728AbjFLOPb (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237378AbjFLOOI (ORCPT ); Mon, 12 Jun 2023 10:14:08 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19F0E10FF; Mon, 12 Jun 2023 07:14: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 B6B6822850; Mon, 12 Jun 2023 14:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579241; 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=NeJmBMc+qN1qkXnt7g1RgqrFwwNflzArnjihi3rx4yI=; b=gFIK1qv7+3u09sRVdTlSN5i09/FxajAi9k1XcX9W9wJtKgypvNDNKBjpr+FOUC/NJqMWB7 em0yUyIGDQPuQSO9qp8XcdMexBu08G4vF679LV3ISLJoCvt1Ag+5BMT/YTKSupbuJA6oe8 UN+BI9+CsGTbb4bvxIdBbcM4UAhwxX8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579241; 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=NeJmBMc+qN1qkXnt7g1RgqrFwwNflzArnjihi3rx4yI=; b=UZGQhraaK4JGeU/nXzIZQfBQi9ePVMq7ByjtD5xJoq08BQMjbwViCPjbhuns9T0rayM7n/ EheOXx5OIeI2dWDQ== 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 6535F1357F; Mon, 12 Jun 2023 14:14:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8By4Fykoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 20/38] fbdev/pxa168fb: Do not assign to struct fb_info.dev Date: Mon, 12 Jun 2023 16:07:58 +0200 Message-ID: <20230612141352.29939-21-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507744620775223?= X-GMAIL-MSGID: =?utf-8?q?1768507744620775223?= 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 --- 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 Mon Jun 12 14:07: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: 106644 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2636377vqr; Mon, 12 Jun 2023 07:41:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7UCYg4ep16glj2Ik7o1xSe7eEDoN56x+9GOfV1Hh7XcZbRr0ihZEUYRRF9Fuqs4B5DPOvq X-Received: by 2002:a17:90b:108:b0:25b:f658:e720 with SMTP id p8-20020a17090b010800b0025bf658e720mr1425878pjz.16.1686580894642; Mon, 12 Jun 2023 07:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580894; cv=none; d=google.com; s=arc-20160816; b=ZuMOAu/BFqk3mZE7SLaqYE/ToVg1tNBGexwzZrmWeI0xaN9tSNXfHCcJeOTjo73KHr luUrNp6TQYIEkg64JFZ1KxfOjCDia2IYYQpAv/ARoRXHO+xkym0JAWmhHIfTp0ajDKbQ vBT9SButK84hMq6808SleQqNbi8VZaAkCpcgKlxdLtGUwuWyTDjHl1bQAl44zcPGEs6f Pu2AaTVZaiZW3MSZqF/ZO8pmzY0uOCi35rLayiadf4OjqWqR4QPleZKO97N57GoS3Cl9 GtREC19SMp837hrstKezfSXjnlwZ55STitxt26da+etGTK2X17mT7bK97+8V5kFXdcDF A9mA== 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=ycsvHkXyKHqyfTafKQc0gRURrA79izYFrq9q9yeJ/ns=; b=UgonjtIjRM/BQFllPaQAt388+VsCyROLrVcbCkGo9o38ML9slNtXITiHy2d59vR0io jWYjXcAgEoR/u+/aCMvbzXspuSi7Q/aC8pc+gGdAci3/vtGZ4NF+kuT27q1bg3oFGCa/ IGeGbrtLk20g0U1jcQS/XqIJhBSEdsHyYCrkn6l+PyMZe2Vv3JVBBxXTYuCfkUj00dYa rzj8RlF2mqq0ksgIed1eRFyOkbKer/HHAl18WLNLbKA+kZX/TRG+04Ui7Q1apaZ5eMaz IPS9IZHH0n94B0h72RAK+Qn6LU+/me12L//61GVkn5cADgvpwvNZ1ciw+x/PnLMwbbsO GO/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Naniz9+3; 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 b9-20020a17090a6e0900b0025bde6127bfsi1988868pjk.53.2023.06.12.07.41.22; Mon, 12 Jun 2023 07:41:34 -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=Naniz9+3; 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 S237628AbjFLOPe (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237388AbjFLOOI (ORCPT ); Mon, 12 Jun 2023 10:14:08 -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 8E6801705; Mon, 12 Jun 2023 07:14: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 1B7AE22854; Mon, 12 Jun 2023 14:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579242; 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=ycsvHkXyKHqyfTafKQc0gRURrA79izYFrq9q9yeJ/ns=; b=Naniz9+3965gHUB2S6NeKdQAO4JHY/RSs5oYEgmctWK/A7nF0GanD4WojheAZ/i/1EdoP4 GsQVoem9yYwtqku8g6YBvs6tB3VhLBzXqIx8bW/2AaJdrgHmXFpQRngQ7T91TzosZMv8ek yGoL6ZlJLaAnbldVDmAphDK0n43iHk8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579242; 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=ycsvHkXyKHqyfTafKQc0gRURrA79izYFrq9q9yeJ/ns=; b=Gt99tqHGBbeV119KG5Re7s6ni75yQa87JKHhl7/tT2WzJYakc0W/S64nUTsDdR9A1/YkEX tXVANoeqhFTkcLCg== 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 BE0251357F; Mon, 12 Jun 2023 14:14:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eObsLCkoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 , Benjamin Herrenschmidt Subject: [PATCH v2 21/38] fbdev/radeonfb: Reorder backlight and framebuffer cleanup Date: Mon, 12 Jun 2023 16:07:59 +0200 Message-ID: <20230612141352.29939-22-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508248178614891?= X-GMAIL-MSGID: =?utf-8?q?1768508248178614891?= 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 --- 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 Mon Jun 12 14:08: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: 106616 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2627070vqr; Mon, 12 Jun 2023 07:26:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ZIYJYNPBxFZxqQ5Izz7Wmjb2POsghrBgfyteTzDQ6JVKbN18iQT6i4JdpiTAQFOgKn6Cj X-Received: by 2002:a05:6a00:2283:b0:664:ed5f:fb28 with SMTP id f3-20020a056a00228300b00664ed5ffb28mr6394496pfe.10.1686579975542; Mon, 12 Jun 2023 07:26:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579975; cv=none; d=google.com; s=arc-20160816; b=DaqaBHfvJ3MUCtTCAnVnrjSdUGFLYMbLj1+vozWNX5s8emqrq5V90mbQZX9nEvoT6y ag0cMqZIAmzcwK0ITxWKm6ueGZZOTfJlXAP4H7huaObFiyB+DwfoqsrSCjtgzKoZzuRW c2VxdYx7ihl+j/tf2OyyyoGZN4wA0KGs4ShilG6ASO0i4YwZAt6a1K3+TXtpyCSXb4Kx TkcAEsw7PqJDDRR4EadXyv0VQJnTb5Z+M7S5T8r16/4BCfvVUVkLi5B6JsGAixVRxukB kZxo0aNelQbsYLktJ05b1Xb9cWD/fG7z+jg0uhw57NFG0ENi3dJQ9t2wpAIfcBe19zvc M+9A== 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=UsebDHSV0686iKDtOa3+K4KQd5u0zTEsehYLUTkowCU=; b=PDiqv3i1c8M3ziq9o0iUJ5ogVfPX+yIrI8JV2qLBrTD4nKnhwvt5bMomiJP3KD+J7s 8J9GkL3LgrX3tcP51qyZJ85zUw64Ap9YbZeXKnvOvwRHhiii9tiFhAA4gRcJ7xu3nFUj /l/5Ep+Mz0qsoK1eGyudoLvOb3Jdm1IB8qZC1nqYhDjwCdLMKACyvOhQLjzGpTeeMRrk UK2M2EhgKkE3FhvO2hzSiW2PV5qFkMGRwfeIzqZ9DOO1XJoLJZgFyucq2YWXc28+o/tV oEIkycdq/27FF+QcdaufrR1fp009C6aw9EeqUvC7ztkBC1U2aru23/dMmHaBgIIkqPr9 V2kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=md6CS79u; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=Ml52e9jh; 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 z10-20020aa7948a000000b0065a4bc8a998si6912173pfk.385.2023.06.12.07.26.02; Mon, 12 Jun 2023 07:26:15 -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=md6CS79u; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=Ml52e9jh; 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 S237841AbjFLOPp (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237397AbjFLOOJ (ORCPT ); Mon, 12 Jun 2023 10:14:09 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDED51708; Mon, 12 Jun 2023 07:14: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 7362F22856; Mon, 12 Jun 2023 14:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579242; 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=UsebDHSV0686iKDtOa3+K4KQd5u0zTEsehYLUTkowCU=; b=md6CS79uOCzoNRJQpJIztowdXlegBRjZ/G6jneCH5LaLc+N5P959eOCA/pCytA0Bgmn8Wa JtXIUDkVeNKlOK2Ej1UYzGnpHyAYuZEoVvbF4D/JtiflnNXW+EZ3s70du9HvVgzIq8sL04 R4ClSMxY01kuR35k0ZYQeibGmlGNxBs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579242; 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=UsebDHSV0686iKDtOa3+K4KQd5u0zTEsehYLUTkowCU=; b=Ml52e9jhZGXtTAT6aarzm32UJgIGjTspVtKTQ049aew4ibgamu8ZNEcxwXzy8k4nT9NYLg lI2vtJQzCuX+gICw== 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 20E1A1357F; Mon, 12 Jun 2023 14:14:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KCwTByooh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 22/38] fbdev/radeonfb: Use hardware device as backlight parent Date: Mon, 12 Jun 2023 16:08:00 +0200 Message-ID: <20230612141352.29939-23-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507284517195316?= X-GMAIL-MSGID: =?utf-8?q?1768507284517195316?= 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 --- 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 Mon Jun 12 14:08: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: 106634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2632330vqr; Mon, 12 Jun 2023 07:34:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6/dnrFLQtOajOfJHK/dyi6hH3I0URtYvMtWKH7k6q6JVCsMW9yBX5YN7w7jKqD4IbFBwyv X-Received: by 2002:a17:907:9687:b0:96a:1ee9:4a5 with SMTP id hd7-20020a170907968700b0096a1ee904a5mr12176018ejc.8.1686580467888; Mon, 12 Jun 2023 07:34:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580467; cv=none; d=google.com; s=arc-20160816; b=EQUxeoeqvubzEorpFJQ0OLc1PyjNS6RHMeKtzHNG3pcJsdaDIrDWit10kqS8AEXvjo myWqZkyRHQPuAdEBjWee5d6ojyr9aQ+IHoKebYAFZSZUgFHwBoXlXNXBgQmye+wbCXIb hCByb9QEuebgohE1y9IxoYsRL8laTMr3BGRg0uwB/zfJBN/gDnnN3a2TYY2rHO4oArrl HlxvJa8k6LiG/m8/YrtzGJLyRQ2twwq9tGFwjdWHiFyTySnEYDWZLqwvOg9WBOhJ5x9Q wB09rkNkfR1Gfe85ia5F1frhi8yM2oZyoda7pcpHKuGIr0PBeRjkvliTiiPRYBBcMV7Q iqUQ== 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=ZMezLYvd1wM4r2U5/PT+E1dmbhnJeOMuc4XP7gGAyts=; b=MLq/4VLA0dn5U95jXv9OyyKKpOgFeeZCoqVRh/QAYMb0Bwe3ZlOnf/yPc8maN8TTQc VykgRvn8+aZYM+qBTTqdQ8Sj6/XN0d2xkIc9Bf2xM7DCBbW682hCmbxZBUXN94bPxhHJ pqT1F6q+7GyuQnPWNPCMEFzP4Y+zBOAX+Hff9wpdCTqpHRGhMpAzNU9Q7hGLMAUAARDV x8WBbi4tNMdXDmZFguB46zAn4EtfK7gBAilCueX3FxktrUpCdVZPYn1pEo83ySMmX4zW Nao9JCUk2r7dXMBTcvqnF0SpoyG51TX/yuuhs59nZ2GNvhecysW9Fkn3ZR3Ys1uPEAgL uVAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pos53zcO; 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 a2-20020a1709065f8200b00974fb749c2bsi1836647eju.947.2023.06.12.07.34.03; Mon, 12 Jun 2023 07:34:27 -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=pos53zcO; 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 S237879AbjFLOP4 (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237420AbjFLOOL (ORCPT ); Mon, 12 Jun 2023 10:14:11 -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 4E71A170B; Mon, 12 Jun 2023 07:14: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 CA1C02283D; Mon, 12 Jun 2023 14:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579242; 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=ZMezLYvd1wM4r2U5/PT+E1dmbhnJeOMuc4XP7gGAyts=; b=pos53zcO3/7qNVyViUFnRcWKhP5plrKrze/JvjwKxn8GCfYQA8qH/Uo9OF/pHPgJ2U8PWe +UAmY2CDeLJWlQVQv9U7ustyi+70xxhrdngHuM0nW+ziQRpTbcAdUhjut6iSHOwt4x7Kec VkgHiAAvJnhLnqC/KrZV0ATDTKea1HU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579242; 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=ZMezLYvd1wM4r2U5/PT+E1dmbhnJeOMuc4XP7gGAyts=; b=N7FSzby/wxuYdzkiF+jH2GY6MlRjrhrIYQKfeIFzxZEcoBUt+c5a+Gz0cFdVBRSJXb+DF8 g39ye9qbPWa4MEBA== 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 793521357F; Mon, 12 Jun 2023 14:14:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qDmsHCooh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 23/38] fbdev/rivafb: Reorder backlight and framebuffer init/cleanup Date: Mon, 12 Jun 2023 16:08:01 +0200 Message-ID: <20230612141352.29939-24-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507800794507371?= X-GMAIL-MSGID: =?utf-8?q?1768507800794507371?= 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 --- 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 Mon Jun 12 14:08: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: 106611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2621594vqr; Mon, 12 Jun 2023 07:17:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4grpz3T6hvavJtdv8way4RPuU22D2Zxq6QeCDavJwrOjHzHFdYJJsFBonTolyIMlMLd0OU X-Received: by 2002:a19:6705:0:b0:4f4:ca61:82bb with SMTP id b5-20020a196705000000b004f4ca6182bbmr3945483lfc.45.1686579456400; Mon, 12 Jun 2023 07:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579456; cv=none; d=google.com; s=arc-20160816; b=TX+OKI38eZ4FhRZNW/o7zM/ujPXwbdcfdjHu5hhf9v8jZvPAhN9UpKIa0wMQzmpsiG mOEsjWZwcnQn47C9tuOyFjMwiVGuVl3G9FplN8GogiPcFps45jQT0B2BEGzZetIvVQRj auTsSYU1rKHksGaml21H8pmixEasodxmRl3LdrAZpGStpBzHwZr94oxOJxoZDDSfW4Q8 jQfJVs98MvtxvOZnJDSYuS+L8zEJFWHr14yJwySSXW2ZqFX4+JoU1FtR4TDrfwYqwEC2 FC/vboM9qEaSV7fYEcveOKuEWuESHLp7G3z9gWrgxfZqAzIo13JOFgfElsISYBMv4BR2 ffxQ== 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=H9xGin3ru74Snz2HAHBj8XYQnAfDRQus2W3VflWxivI=; b=UQ597hHkbhXRVEu7Xr2hhiApeAcVpVfVVrePLQkYRP9kQ/rbqQwaQZXc1+3MhOjDzy YAwC6kY73PQiegUCKcpumfh9Ipava/VY5iTicp/zAFeo3xafX49c2YYXJuhREyaGa0Rl xAgRQ5NUQAKIXh9qpzBr659Zu1xln+4gDPQJA67VqURk5YC4HZeWU7E6yGlpD95ciynl oMQcMpZo0SjS3DoSgXqvzetM1GtWRr/Dq713X55pKivWVhD+aiLlnSnA6efML2i9OMCS x5bPuSISveMHv1mNhBFb/UYJQPUbOCjgoswy+k5znxjpRGEtdZ6vAMRisZAnV+weVonY xnBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qDLMVhTj; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=Hxi3puza; 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 f24-20020a056402151800b00514a0265c50si5973606edw.253.2023.06.12.07.17.09; Mon, 12 Jun 2023 07:17: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=qDLMVhTj; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=Hxi3puza; 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 S237869AbjFLOPx (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237421AbjFLOOL (ORCPT ); Mon, 12 Jun 2023 10:14:11 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B82161711; Mon, 12 Jun 2023 07:14: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 2D58022859; Mon, 12 Jun 2023 14:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579243; 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=H9xGin3ru74Snz2HAHBj8XYQnAfDRQus2W3VflWxivI=; b=qDLMVhTjZov9X373CAg3/IEe008qLw1ohdsGPy65RpQKyK3XBCyzEXEyb80l7GkGtzHIgD RVT2PZ8aC9UzHcOm0f6l9qjsgj1itISjbkEXKgQWjIGv925C7zzkElGsSfXuWoJRIuN8M0 PRGRHbI4hmC97SQzNNPO+TdHrSlogI4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579243; 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=H9xGin3ru74Snz2HAHBj8XYQnAfDRQus2W3VflWxivI=; b=Hxi3puzarx3ZHXEsSCyds+IilPqXL3nJ/227/LW6komZKjUVwQbW8JG6qpHgc2o20SJNEg SWuF4CGLVXHf7lBw== 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 CEB4D13A67; Mon, 12 Jun 2023 14:14:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qBybMSooh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 24/38] fbdev/rivafb: Use hardware device as backlight parent Date: Mon, 12 Jun 2023 16:08:02 +0200 Message-ID: <20230612141352.29939-25-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506740136506576?= X-GMAIL-MSGID: =?utf-8?q?1768506740136506576?= 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 --- 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 Mon Jun 12 14:08: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: 106630 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2631584vqr; Mon, 12 Jun 2023 07:33:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xRFGPKN+d+kz464BAwkvjjAmSvfkeqkfXqSt/kYG0ZNaiEDh7y/+gfcBt7avRRkTjiABe X-Received: by 2002:a17:907:16a6:b0:978:7597:ef4c with SMTP id hc38-20020a17090716a600b009787597ef4cmr11424922ejc.63.1686580399728; Mon, 12 Jun 2023 07:33:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580399; cv=none; d=google.com; s=arc-20160816; b=byXBEY1ZHYVOIVn+WE+dHCYlP9O5j+rP/ZFwuJdfGq28ReQrGKDBjAxOnQqNEQ3dDQ h0FerMW4QI80DaFRXT+zSfLMkAkA/3AT+NKeiLRWYU03HC+hJ0vIuJ+/5ExgmGbin/V2 qeHyGtyODkLgRzIPzHS+B6gr0mhCgLWEXYepNV92GP5XwtPOgLKgL+CsbxLErJ3BG/h6 MxIhvcppvxhxuVFGEg+Jd0nHQFDN5INdiOu/NMDPcPlMOSYRv85E1RPw3gAmX2ZeWYwU WfjZPio48fPMH+iKzLwxA6SoYeAM8QkSBoh/PZip3TrhEKxeRaeukCzZ5CXDv5jn/drv II/g== 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=DApq01bMcWPqgYhwuryEu5qdYBZjYFccLYihwSFiAXk=; b=roKz2wzR91NgrO7kjDx7qzoYMJwbo0AyR8uqrLthPbzVfr4AiQaUHjbIuQoAoMEomp EAn5uwXpy3EyaBMyg0NbJwwlnbq+f8jpF180uvK0O7H9SKWLtEMPmNdoeBaeju8sEwQi cHtHx4oe96CKOqg3IrWMASEfE4DkbpgY3hq6v6YtQCaufB3EIBOxSDnAy8d4u8T3tj4w g9g48EP+ucG2Ih1vu0q238Oq2QqaJJl03vbAs0lSUftSpIWRnCTMZS2vYEZbs15OMNRC zuuZSs0w4NE2anCslcq2zn3Siztojwuay8TRv2K6YxV9+sQZ/HRXBXYcQH7Z7eIWhxVp p8KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Zora8Hfw; 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 f19-20020a1709062c5300b00977b21d0053si4999981ejh.469.2023.06.12.07.32.47; Mon, 12 Jun 2023 07:33: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=Zora8Hfw; 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 S237901AbjFLOP6 (ORCPT + 99 others); Mon, 12 Jun 2023 10:15:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237427AbjFLOOM (ORCPT ); Mon, 12 Jun 2023 10:14:12 -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 F35EA1718; Mon, 12 Jun 2023 07:14: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-out2.suse.de (Postfix) with ESMTPS id 7F7652048D; Mon, 12 Jun 2023 14:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579243; 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=DApq01bMcWPqgYhwuryEu5qdYBZjYFccLYihwSFiAXk=; b=Zora8HfwuVeNq+hm5G6DUqPUKgOtH8m30gUW2OZP6oVeOC0SvWGqgTfYBjKPMAc4pI9aQI 6Ew5qXJjBTM44urrB1/6yhlbyymEG/osTY/bs4iFSYk4d5bxC6F57x56AInpWgVPVsVN+X 4ceLrGintZ/Mib46vhkSzUt+OkIljto= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579243; 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=DApq01bMcWPqgYhwuryEu5qdYBZjYFccLYihwSFiAXk=; b=H/zAlbOtFqKuNb3tKoyQFw3FYtGoeSWfqKSzX2hZ0Cmx54Oz0an5bSEQ+PUQanuJpxb/Pf WQfNEU/GNlTsfLCg== 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 30A641357F; Mon, 12 Jun 2023 14:14:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CFDoCisoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 Subject: [PATCH v2 25/38] fbdev/sh7760fb: Use fb_dbg() in sh7760fb_get_color_info() Date: Mon, 12 Jun 2023 16:08:03 +0200 Message-ID: <20230612141352.29939-26-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507729292422934?= X-GMAIL-MSGID: =?utf-8?q?1768507729292422934?= 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 --- 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 Mon Jun 12 14:08: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: 106633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2632328vqr; Mon, 12 Jun 2023 07:34:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ErE/XnmcPh7UKwh7/6IvtPzFW2opMkK1SKjFO6Z91Xa02DxHnTxyWqZNgR+oMkCxqBq3Y X-Received: by 2002:a17:907:3607:b0:973:ff8d:2a46 with SMTP id bk7-20020a170907360700b00973ff8d2a46mr9862988ejc.3.1686580467867; Mon, 12 Jun 2023 07:34:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580467; cv=none; d=google.com; s=arc-20160816; b=daintBrfCYsM9wKs7IvuwzFOaJPfBFttorIkOOPROefhHO2PEHl1tiGpBCJ1ub412q lEX/f8b64WK6W0jq6Xs15ekIHs5nukQEZ1c6SK/fU0YLT1gVn6QLG337lHeDBV0QstPL y61vopT5h3ZH6kY8ChYgucx8M+B80RlkxzTxMhc77UiPWiseydvYBqba7XSPh2Ok/Vbj u90Ud2j/OPj2XicrLtpgKQ6Q6Fs5InyoZFy0lLvXqIvuT9IdtKWScHS7gGI0xTr4Vw9o q9JJkAYJOt88FfVk21sCHEEBaP82FUlVziwIn/2QtZgeamW1R/GyoZI1qqoZuoAOY8Ph hLeg== 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=TBL4s6EwpQYL8Rm44U2/nmPhozWpkgd0TW9bgt9l7x8=; b=iZ8mFCq22fDntWKkLUCJ6OD0Fa9WuQCS7MVdcW35C7pdSWh+QJDGnzhtQtoTVwDNLw KQHMG31b2y0NYfjg9ACSNhQD3dgIIH+2bmczGVEFh6w2zcLy8DzBxCRnOhrTHumfIvkF WGoEco98fnNkWeA4DFsttejtpwpoS7zbp+9tT66FExRGl3Kp1P4lDEG1h0Tkq8ViFbTo DsR4XO9BWhKdStbdT2P5guCuWFFmWBaJlAxjYLd3pm6IJrlfmboH0hoEJu6szNgydk61 LB0tV8DGSEfKQVTv01o2mMVLEbEP0vL5eB/A6f2uhuWamX+I89IY2LlBALDZzxCU7Vxm pCpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Y71RD0de; 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 n20-20020a170906379400b0096700e71066si4928868ejc.1003.2023.06.12.07.34.03; Mon, 12 Jun 2023 07:34:27 -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=Y71RD0de; 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 S237915AbjFLOQE (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237434AbjFLOOM (ORCPT ); Mon, 12 Jun 2023 10:14:12 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36951171A; Mon, 12 Jun 2023 07:14: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 D637B2048F; Mon, 12 Jun 2023 14:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579243; 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=TBL4s6EwpQYL8Rm44U2/nmPhozWpkgd0TW9bgt9l7x8=; b=Y71RD0deUbbtqkmKSGPXZNgWh/suxy+0C9JXsCGTXogn4e86Urc78JtJidWBIhbG7LEjWJ pJyfw5AHUq+fveryh9UNyQrzBREDPWr6hxJeyiwGFmTDzEacZSoZwvtN5fpsIc/taBK7Wa dfs3azAcm3QZ58QrmBoH1Ec8Y4OyI+c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579243; 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=TBL4s6EwpQYL8Rm44U2/nmPhozWpkgd0TW9bgt9l7x8=; b=+6M2cZgJ3ORpyFcJC1yeS8svhlpH59J00iB969mWx20wgVEUpwa5onTMHLvm+2flw3RPyF PvDDDQXF0OyqWfDA== 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 852651357F; Mon, 12 Jun 2023 14:14:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uMCKHysoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 Subject: [PATCH v2 26/38] fbdev/sh7760fb: Output messages with fb_dbg() Date: Mon, 12 Jun 2023 16:08:04 +0200 Message-ID: <20230612141352.29939-27-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507801015578870?= X-GMAIL-MSGID: =?utf-8?q?1768507801015578870?= 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 --- 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 Mon Jun 12 14:08: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: 106651 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2637074vqr; Mon, 12 Jun 2023 07:42:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7tda2ep+ByQxZ61WY2Ttydy/mBhjBnk4BRKBm/mH7L+DjZNzeuI6MgK3KRErPE9m53OR1T X-Received: by 2002:a05:6a20:9382:b0:101:4e04:cef1 with SMTP id x2-20020a056a20938200b001014e04cef1mr11608852pzh.27.1686580969820; Mon, 12 Jun 2023 07:42:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580969; cv=none; d=google.com; s=arc-20160816; b=sUYAWHPxDP2mOEq1NrtBFYkzAgs/gGAXk0TmC1YDy1KqsZjQCM++wcmIAm/O+1RfQn PKVvayG3dWIn4bBM71KAiUSJC2s2Fh/Hcm3pUIWW8BdtbHxYvlTgkKTUoKowfhQ75YA3 T90q8FfJ8ZTw7YB7lp8XJ0eNVWX/XMR35DbyWwdZ4r+qnpb709lpt2LtontLL28kuLTa xZDrw/u905dxltPiEvZJ2yavHziBwXHdV/q010EAqt/jNglXPROdap3wBCSf/eCGuOh2 g1lPR78yL+ucRZsVMdDzZJRB6AooWLaNpJSoiguUETWjHbO1hLtO6qTmD9lOw2GY3a2J riCA== 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=ayPOKXHeROJN9rdULX5r9c0iDdjaN5Vg2jgiOS1YteRmNYKBTeuAU9aQTrzb0j4E9G sQl5EABhuLVQtvZBmGS7etdjOgdJnyOrCqmTWoj+yXUDd7pMTyMySYKm4kLAgPCnRVDJ dB+3Wux31wCqwzSETVFca7uEYc/b8Tu46LnKfwA315nD+5ftznb/xW2bcg1psBe14s4U +EA3ZtFr9Q0uivt8HorDQozGsT+uRoiztHZQDMy50jMq2yM3niY5aBiFxTQ+v6C9HAbB a3VuuZNogdXz9keiKLHf5aUsRr8t+RDnx//hyHLY3cxf1mG01W0AT9rpxy9Uk2gey/jJ zchQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=AHI08y1f; 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 bs6-20020a632806000000b0054f78758283si2428115pgb.601.2023.06.12.07.42.35; Mon, 12 Jun 2023 07:42: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=AHI08y1f; 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 S237384AbjFLOQI (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237444AbjFLOOM (ORCPT ); Mon, 12 Jun 2023 10:14:12 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91C16171B; Mon, 12 Jun 2023 07:14: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-out1.suse.de (Postfix) with ESMTPS id 3B9372283A; Mon, 12 Jun 2023 14:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579244; 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=AHI08y1f8JihP03XKNpKbl1vaizBTPI5K43MMdO/TdETU8xB6NxuRhwJTpDwq0L68pX2nh VC76+3s0mLv4yCZnoLFlhiNqXj7b8B33LLwRQh2b4ANcs/laSMCnUm6Xt3MA2TEDLXkuxC uTksYprnh+U652UGBOwucn/rRHqF3pg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579244; 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=hG44xHjYPp/Vn1tfM9aUynY4027Y/5BJBkSD+r6gUlRSZsPJ51SnGX59RBzWorB5BxzLmL vDv0H2vYYTYZhRCQ== 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 DBEFF1357F; Mon, 12 Jun 2023 14:14:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yJ6qNCsoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 Subject: [PATCH v2 27/38] fbdev/sh7760fb: Alloc DMA memory from hardware device Date: Mon, 12 Jun 2023 16:08:05 +0200 Message-ID: <20230612141352.29939-28-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508326847824582?= X-GMAIL-MSGID: =?utf-8?q?1768508326847824582?= 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 --- 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 Mon Jun 12 14:08: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: 106612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2621822vqr; Mon, 12 Jun 2023 07:18:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6VM/2GfVywBydLLjAyw9oFLNqbEFAHxmcK71Nw8q8S9N4hznTOYKk9Bk9/QmB70C6Y+vgY X-Received: by 2002:a05:6402:549:b0:50b:81bf:9e4f with SMTP id i9-20020a056402054900b0050b81bf9e4fmr4380451edx.12.1686579481310; Mon, 12 Jun 2023 07:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686579481; cv=none; d=google.com; s=arc-20160816; b=h+ArKUF6B8h+5wmqSqKRGaWRbw9ldYIQ5Ivl7h2gsBe9e/NYjyOz/l+JBWhCbeeGt6 JTlKppLhFiRF/3oLfQ+UQJT4GomiGHUuiRF9VONQVf5U546bO86uDOf1CQBVDGWRosNY gnr+e/Uq3Gw22xd2/lXQJ1oj22WeCt8KfELcRz5lTnw17v7aP3fu6OvKlHP/CVeBu01C fZo/2oXzuX3Oln8wntxI9cisZjaTDpKidj0InYXv6gwUyYiaP0a6iMVnm+xgZMymNnow LDYBTcJaAUetED9D0z96hC1MuHltII3x7Tkaj1hWmOq0/P0iai6hyBmaS8fAX7TQYZRD 9GsA== 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=g3wCKV7kkk87zubrz9MEzYCCAV0sKbpNFal72zite58=; b=twvhQTISlBrBVMxfF/WM061X538lFYruPKjplmXIsB5aerotLf/RIIEbecZCwUZ/bL wB48S19C6cqXH6YB+otp8iYHRGYux9g2XthV22XN7ZYVAjn/X40ShJlVv+NOxkUTO0Yh 7UE7UQSShQRZMlNwCjxick512dgn32512qq+Gt9/7GpDuzQaSlC3uVCUyYL/NIY6aONp s4lwz7uxHOf6wWvtkr33ZJMx72AROtaQwBmZDGdk3PF7fNeNE4ShsoUbAEedu2BaZ1CI E7bZB17JgxaJn9RKcsvssXTC+EXQx1rKe98mvxDRz4xB8/WbQLFM7zNqkXNNNdsqwUpS H5CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="I1ahMZf/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=ltbTpBSR; 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 s20-20020a056402165400b00506758661fdsi6141774edx.618.2023.06.12.07.17.35; Mon, 12 Jun 2023 07:18: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="I1ahMZf/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=ltbTpBSR; 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 S237947AbjFLOQK (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237450AbjFLOOM (ORCPT ); Mon, 12 Jun 2023 10:14:12 -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 01C6F171D; Mon, 12 Jun 2023 07:14: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 9040E2048E; Mon, 12 Jun 2023 14:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579244; 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=g3wCKV7kkk87zubrz9MEzYCCAV0sKbpNFal72zite58=; b=I1ahMZf/iz09dQaLm2xUbouAtlZQq2mNHcmfvUNkB/sP64j7gYrK2kjM7GO2GrvGOo3XQs C0rVYq/BLUKjnc6gxqJkSvS6StqjQumxwNeOsmtR2Il7OgnVWzfgCAzC0kWo6V3enjcKf7 sgf3gV+RFcYgUES04BIAmpugIC7Kx6c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579244; 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=g3wCKV7kkk87zubrz9MEzYCCAV0sKbpNFal72zite58=; b=ltbTpBSRPHpJOGUZRcjwDOrm+r8bj0fD3CCYA5M3SnyL4F8Td+rvB2X5eiO65PhKS6mhPH FjXBiKwc2+MajLBQ== 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 417241357F; Mon, 12 Jun 2023 14:14:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8CcBDywoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 28/38] fbdev/sh7760fb: Use hardware device with dev_() output during probe Date: Mon, 12 Jun 2023 16:08:06 +0200 Message-ID: <20230612141352.29939-29-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768506766436177925?= X-GMAIL-MSGID: =?utf-8?q?1768506766436177925?= 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 --- 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 Mon Jun 12 14:08: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: 106653 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2637205vqr; Mon, 12 Jun 2023 07:43:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6M7FNQ+zVu65j9Y3U7F58qECqIJ1wnEgqNFQXNlgEYO5llFJuAYx9gpgijeCAw+yJ5dghA X-Received: by 2002:a05:6a21:9985:b0:10c:3cf3:ef7e with SMTP id ve5-20020a056a21998500b0010c3cf3ef7emr12204516pzb.42.1686580982242; Mon, 12 Jun 2023 07:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580982; cv=none; d=google.com; s=arc-20160816; b=fUMtq9pGm4hfMxn7KzeJP0D0XwRXMyfweVe3TlkSPqqA1Tqr5WmkUd/JPLhxBGELS9 5wAXJSDxB/Eah0GPaRrcXJt/NbUXmjSK8XnOcntC7iCJeNdpBRhhq7JOEQhG+rv2i4fl CB7UTCdwKTqROu5ejJkyjBlMswF9VyGmC8C6pfgMq3BpMsG8Mf0Jg50PwRKGguwh0X4a 1exScQVV+BsnpiPLV+7CvzyKwYv9EDbuqOW878HN3kmWdNrbFbTNo6UZqM2g0GzpQC0u 3IXIXKs8OYOxhBVdZYOHzC4M7SSCLYBPHOItfwMqA8NIRzpm2eolR6fO00TyWE2suPyg F+uQ== 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=v/rvxW2O43pCvZ+GN2/q8bAyJjTmvg4FNOCvRWBvPKI=; b=fWbbKStLMb1EsACAXJys99sRSgxTZ8ZBVWQ5fKakiXDjBevfhzSMDyNap/rJmNt4Dx 4CCEwuX7cmgzYO89PNIMWvG82ahl2vKlFNrYXTb83YB0n4sfl5CAdo+37yEQQ3E/QAu7 UQ0twolLKEcJuMVYvs2gFFm9AMqGC2ak1lWmEE2IKWX327jyomXebzUBZ/FJwlt08UJN 6w4IBg1+7G1nAlL4TNl7l2rtEaXh+u3+0Ag2rhDMqlIBTi9wkr0QvAaA9pFhLylu4mBi i63naiKsQrOftuvlwAkYxYb7EjXnNhx4tYuas5ogYz+oPgVfXyEhl1UD2YA6EN+8mxcn 4M/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=JOeZB5CH; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=hBSal+8r; 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 s15-20020a63924f000000b0054507258ce0si7108497pgn.234.2023.06.12.07.42.50; Mon, 12 Jun 2023 07:43: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=JOeZB5CH; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=hBSal+8r; 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 S237602AbjFLOS7 (ORCPT + 99 others); Mon, 12 Jun 2023 10:18:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237453AbjFLOOM (ORCPT ); Mon, 12 Jun 2023 10:14:12 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 468551726; Mon, 12 Jun 2023 07:14: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 F335920491; Mon, 12 Jun 2023 14:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579245; 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=v/rvxW2O43pCvZ+GN2/q8bAyJjTmvg4FNOCvRWBvPKI=; b=JOeZB5CHu0XS+FWboCL/uKqCRKsV70Ec7jBvvNS0RyeNEC7uQxc7gZFc+/Ojq0todFQ/A4 OIIcoSVCb89Ib7Q2cZk9XJ+GWd0lBekZclocSn7aE9f13Xuvn/Cn627MupCTzkxLu6Vf65 b1BQ2uDJvnZZVqJ3DvQzixGxhCv/Kmo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579245; 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=v/rvxW2O43pCvZ+GN2/q8bAyJjTmvg4FNOCvRWBvPKI=; b=hBSal+8rsPdprofOWxvTFORFufvERsy9zFuOOd54Zw51ijqiJgrEAMUXCsHzc5IXYsgAV6 PSJ1IPqfydQb+bAw== 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 96B521357F; Mon, 12 Jun 2023 14:14:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2FHQIywoh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 29/38] fbdev/sm501fb: Output message with fb_err() Date: Mon, 12 Jun 2023 16:08:07 +0200 Message-ID: <20230612141352.29939-30-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508339663992180?= X-GMAIL-MSGID: =?utf-8?q?1768508339663992180?= 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 --- 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 Mon Jun 12 14:08: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: 106623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2629773vqr; Mon, 12 Jun 2023 07:30:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7wKbv850KyMkCv4RkpKEagm+PT6mCrkmSjboBQyQZUWN5Xwnab9UehDiQJIV9xLVQmIJ4Q X-Received: by 2002:a17:907:a06:b0:976:8fd9:f64a with SMTP id bb6-20020a1709070a0600b009768fd9f64amr8688631ejc.24.1686580254777; Mon, 12 Jun 2023 07:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580254; cv=none; d=google.com; s=arc-20160816; b=YA9Nit1249ytlLNZ9TmeZ1nBUzOhtg0vkSV7UVPqEQ99ukEEAULgYNB8Zw/z45I6B4 CyOO0jRGHfsOYD+2N081hZkF4P1dk9ZCOGKw276IElntF9YU6MbhdKWNqNnl7sFC91ub zEsiZqDw9mxsuB8Erikw/cIfyz5o3q2/MgHxxuNexi7ho3lP1N1ielLeWv122phLB3RP kPxMmPToUQXy2vhpxfoJw47yq15+UYwjG4yPjxA2Z+bZQptbMbmxLNLaDFLTqr+BFAtr Gj+Qw2G/5Hm5q/Ao89tZ0amYgKOMsmova5rhFJeVx+tQkBlqWcclhccwhxGD0Qenk366 CEvQ== 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=S1Olul/oaE63fWrE/j5u9x4DZfjCE8nyRXxTo0po+RrIM8xsSPH95wIH0ClkPt6Erz a320NxXDDNG0Y6kSzM4lwMjNCWAMqtj3mwvk9R+FRbCV+FBlFu6HPfCbPDHmyRnxvWNX p7XQnlvMq07luDZ5kupqbXd+R19L/9msvWwp0JZcKPC+fJfT6F/eCvDrEzrJdo4bO7qy /qGNjxKveBWNPCaBLl/+SvcMFQ202+Yw+yUJ2pvRTMUWxEeZnpIqXmBYwP68Fzh6iEWk O3MR5gpsSztz94EWXNT9n3v2hoUnn5RKM76oWGervGszzuV/esyZDdDc7o6JLpmxTHYG nYhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=gegpe+9v; 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 z3-20020a1709063a0300b0097ea92f4cd9si2851939eje.417.2023.06.12.07.30.28; Mon, 12 Jun 2023 07:30:54 -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=gegpe+9v; 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 S237486AbjFLOQT (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237490AbjFLOOS (ORCPT ); Mon, 12 Jun 2023 10:14:18 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C78671730; Mon, 12 Jun 2023 07:14: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 5A4FF20492; Mon, 12 Jun 2023 14:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579245; 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=gegpe+9vyLkqNTkBTGR11BZxPutYsTdnWCWxKeuaOS0A3zwa9/GFN33mfes/NH6t1b06rD yjYWMgl4qmgcuI0w8L7QTIj8e8g7cV4uB+q8eQyVAW5gvOHrlTq/nP7PrE5bwCikwHwM8Z n0b/NyoMOl3jV1EZ0mHlFed91dD8JdQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579245; 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=FwMqr9WA9BT+eo+qmh+v4GptZ74lENjZYOvsjZqTEDkcu27nt6z1ivepQnIFjcF5Nk7j7k lyDQiEhBQjlPzzBg== 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 04AFF1357F; Mon, 12 Jun 2023 14:14:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uFYyAC0oh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 30/38] fbdev/smscufx: Detect registered fb_info from refcount Date: Mon, 12 Jun 2023 16:08:08 +0200 Message-ID: <20230612141352.29939-31-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507577449528737?= X-GMAIL-MSGID: =?utf-8?q?1768507577449528737?= 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 Mon Jun 12 14:08: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: 106619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2628130vqr; Mon, 12 Jun 2023 07:28:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7liSqzxczPz3hPEGr4nOwUVdZ8JUiNEdlK6fkzitVCF0AQvdlzmrYptBdvithkGliIh36j X-Received: by 2002:a17:902:8a97:b0:1b2:5ee9:aa73 with SMTP id p23-20020a1709028a9700b001b25ee9aa73mr6317118plo.62.1686580088454; Mon, 12 Jun 2023 07:28:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580088; cv=none; d=google.com; s=arc-20160816; b=larJVVr8OhSdFop4Y9hjD33wZMJ3KimuXcs2LTs/Wbi5W+wiILGky+Fa3cUZtWXd1t 52VNBMi+z/JCilnCNYWTNEe4KnVjw6hckBunDILsrpG1J7p2DHH6RBcjju9w7SWvOilQ xWDq/URz0VWXKNT/x3kw0cRXlDfHBkMwjRqrI0A2yXSsDWRkFqvF9a2WlrnZMRzyWAAT B0D0KOVq/ErDEUnqzAiQ8f3FnQa/kNw+K/ju9j2cQW4+NeLOB7J15RdfjznWzm3Nixic j9S7x8g+64a3CBi7aT7aEOQrSskco7+9sJuKpadf68kH0SIuth01K/r2ioIdGvtx366m 546g== 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=Uq3P5AVTLRK7bl4Y5Ypo+7feJO7mfpXNi4f79/IoFJA=; b=j80y+dRSXd/25y4rm76Z2veMm01ENQMDMR5LIpoAKuUe5TcAkgXdNhj+gNR8i+0B7/ cmCCbOmlB7+W+MJxsSAGnogCW9SNqseEE3u5ik4fhOwc3wmvRMLOJv/tlpaaJW+G0YKu 7uvFPynVxtW0K3TBzr4NOqmb4H/JETI/LQJSYATKe+VLBOuCGYiBxTnxGmwCAJcwt23V xmYK55BsMj+/gFteUjXpdomD9GYLPlC++VXWyHwsCsIaEB+JDOvvZD8i7LyMgHNNeEF+ bqrXqsflqrdbH4r0AM/EFuXaS8iUvyuVO+jwbgf5s2WOvfWVfrW6xVMLI2WZxN37WqZb ytlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=sRseSoPD; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=L4Ecb5bK; 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 lk8-20020a17090308c800b001b042e93c11si3613902plb.262.2023.06.12.07.27.54; Mon, 12 Jun 2023 07:28: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=sRseSoPD; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=L4Ecb5bK; 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 S237377AbjFLOQt (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237491AbjFLOOS (ORCPT ); Mon, 12 Jun 2023 10:14:18 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 385481732; Mon, 12 Jun 2023 07:14: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-out1.suse.de (Postfix) with ESMTPS id B249422855; Mon, 12 Jun 2023 14:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579245; 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=Uq3P5AVTLRK7bl4Y5Ypo+7feJO7mfpXNi4f79/IoFJA=; b=sRseSoPDBMYHnoMO82X6VaU5G6VWzq45iiA+OXn+JB96yJf5ndMsdKQanRhFSDUtkC1v6s vcGti5xBJknY4oguTiIGhEKh1YzWEp36oIMVzxULJ2oex1ecUtf4s5jq8qlHyz3qy4D6Mq PdENCOcRsV+VtbhZVTW60wVD1/sWArA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579245; 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=Uq3P5AVTLRK7bl4Y5Ypo+7feJO7mfpXNi4f79/IoFJA=; b=L4Ecb5bKDK/bqyWKK0bpLBlHmnKq6jvyOIM/GZXblzKlOLVlqTrwQAaD8r7vVSOkE+Z/wz vuDO0QnXT3uFGNBw== 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 60EDB1357F; Mon, 12 Jun 2023 14:14:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mBWRFi0oh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 31/38] fbdev/tdfxfb: Set i2c adapter parent to hardware device Date: Mon, 12 Jun 2023 16:08:09 +0200 Message-ID: <20230612141352.29939-32-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507403071866790?= X-GMAIL-MSGID: =?utf-8?q?1768507403071866790?= 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 --- 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 Mon Jun 12 14:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 106639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2635066vqr; Mon, 12 Jun 2023 07:39:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6njY1NhNIFU5jP1vHSXmW7eLymJqM2wZ1gfO+TVXdfCV4OQoCh3D0EUs7mKDLwLWrc+ALH X-Received: by 2002:a05:6a00:238c:b0:653:a9ac:44c with SMTP id f12-20020a056a00238c00b00653a9ac044cmr10463508pfc.11.1686580746853; Mon, 12 Jun 2023 07:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580746; cv=none; d=google.com; s=arc-20160816; b=kUodX3fvs133Zb8AqYEzmLPfFXh6oYu5UMQGP1YhnfI0zZWE2ihKtyAk5s5wH/eCyp u11oI4UloaS8eP1v9fmwQyXFY0lwwUCh7YpgLCHy7Q+drGQV8/HXSLDatTiADbhLWoBC gX63eWjz7lxhQQo6v9GV8fC/FNSSB0jWEBB69q45SZGVvfKNEjb7LC9kgCOkxBIDvvdM VDNwe+kjEc/NIJn/LEFpNi7nUeQ5wad0ghkHNEuoxdfKvy4zyrFKsRx+p/nciu3vpNdF 4oiGtepozaV/u+ANIH9URkBI/BLViaqW5rB4pHquKfAEGIGZqNFdCMDke+fCQzN1fZGk Rwrg== 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=W9LxP+pxcYjurjFozISjr9Tpa6nUP5N7ri9wuwW0VKhY+Cam0wnAwBLSn4w8kTM5dA 5fQrOq8Hz9qZrisdxv/S91TC63EiYqt3vGsk1ugpfip9HV8PbWsRYZW1xJtJCbzuo/+8 Tui+MMyLAOANquRZoVVcE4oFgQv4RqXNJacTK0QE4fUrfHgHCw/WEkiPog36yMYZqnSp ZV++HXKPYIlusprPsskz04O+YiV7z4Wv6xlYtEBBmP9hSqST0xYoTjT8yYPrTNsvD41S qhocAK90oggFLGN4VUN+gvpNbcR2xIb7oqK5YpO8hrI0Su4YyQhLP4qi49J/2Zmrmfvo nb9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=YW7dZ701; 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 b23-20020a639317000000b00534878ba944si7130564pge.336.2023.06.12.07.38.50; Mon, 12 Jun 2023 07:39:06 -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=YW7dZ701; 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 S238126AbjFLOQO (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237573AbjFLOO0 (ORCPT ); Mon, 12 Jun 2023 10:14:26 -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 B1CD41739; Mon, 12 Jun 2023 07:14: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 2711120303; Mon, 12 Jun 2023 14:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579246; 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=YW7dZ701TvOnqlMR8gFBysNuPUbYNTelX9vLjKSzornfYYZqF0nH4BOrftKaBX8W2D9qOs 5mVyk6TbL1FlvxhtHq7WEHfSW/x4FItGyUgHHaDAz0IFqQXtJAuw8umiJJrosUJ2byDdsN vR8D1ePBy4GbOwa2TG5pluvK+sSnIR0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579246; 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=Pts4tHT1iMgkfuxBHUYSUhjmjw1VJOQj7Qpj5Mr2WWwSa4WQ+of8NRUgYpCN0dKaI7HfoN 6DWUpN6gVZewJ1Bw== 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 B88181357F; Mon, 12 Jun 2023 14:14:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UCENLC0oh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 , "Rafael J. Wysocki" , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH v2 32/38] fbdev/core: Pass Linux device to pm_vt_switch_*() functions Date: Mon, 12 Jun 2023 16:08:10 +0200 Message-ID: <20230612141352.29939-33-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508093436053513?= X-GMAIL-MSGID: =?utf-8?q?1768508093436053513?= 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 Mon Jun 12 14:08:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 106643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2635955vqr; Mon, 12 Jun 2023 07:40:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4b9zSwpbAQb0xyzHGZHts/+jzS1LODX1GrMIV46MnKV22/xEColyv8IbGwAo+LgNcckt7T X-Received: by 2002:a17:902:864b:b0:1b1:ae33:30de with SMTP id y11-20020a170902864b00b001b1ae3330demr5939165plt.13.1686580847862; Mon, 12 Jun 2023 07:40:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580847; cv=none; d=google.com; s=arc-20160816; b=RWFj4CTyzUiagDJuNVWcVFTXhLUswMRGib1ai5v9aILXMhnsQ/RlRYcZx07z1Dtu7l CT0BP/Dy2OWHiv5FMtQZpfknfBBZpyU3Q8v8MjF525GXfhp+ZQ88+8NWpqKePp1E0Orf dHX7vIZB6lUiprxngMsyaMWV8PCu1Mgv9D0vqQjsJT50BvUv/ueTKkIn29Zk+fWTUeQG kBxzTZJj7Rpi55p2XzQ1UJ0HYiX134k9b2YnjsRht0ae7bOArlvm/XEO4CEalvEL4vIH 2M85izjbYJ24Hyaqvg4W9OX9pQXaigEr67e56XGwur1vCu/TKUm0QDZwxMQJM0jtf+bz UCFw== 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=qoJayAinGwtnjH23GgF1RSB1m6///GXaSmmrIwEpuLcduniMxft4wZcsv8zuAXn2cC v7F+yy367HI9CHMBMB/4HYBuB8mF037zuBns5oIGnwoKj/OZjYkzAx2pUcYvXhWZgpVu zoDkHgUEB410t8k6DmaWZaWc2jfQRT25k28xhswXqqcuXqIyWozWXIKMYV1hi60fswsA oKUw+yxiEz3gBF2yGVY4KMcgsBbVlr6tcGOAkCIwH5yP6j5LybQhQTPIdtVhqtzouMyP F0T612ZA4fJ8MjM5MAKeTtb2bSRVONjiSpQ9D+AZNbRM+Oqq+mxJ+sUJr/x6mjH/hVUj zT0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=sDvYrg4i; dkim=neutral (no key) header.i=@suse.de header.b=OW4OfnIA; 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 lk8-20020a17090b33c800b0024ef1d1151bsi7416364pjb.17.2023.06.12.07.40.34; Mon, 12 Jun 2023 07:40: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=sDvYrg4i; dkim=neutral (no key) header.i=@suse.de header.b=OW4OfnIA; 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 S238011AbjFLOQX (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237410AbjFLOOc (ORCPT ); Mon, 12 Jun 2023 10:14:32 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C56B1173F; Mon, 12 Jun 2023 07:14: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-out1.suse.de (Postfix) with ESMTPS id 822872273A; Mon, 12 Jun 2023 14:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579246; 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=sDvYrg4iyDbhOjotPD+QhWNlzon1voO8gd7EwAYGjZxIeKu9rJ3wFjnXUzkRM4+W39OX9S kYLr7T/rr/8WwABgiUpCCkuyfD1gCqFPVyqehITqo54K7MMNCzIgQjQLh+Ftn/ynUb25fL XqTbj66tcWrXrhpVnf8iIN7ZIPv2/hw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579246; 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=OW4OfnIAJSd2oORHF0mhf5Gj44hTAaC9fiQJKCsfe1nN99etnHCkyBYWnHZT/BDpPOnL5/ gizTf2JQDsFesvBA== 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 2EABD1357F; Mon, 12 Jun 2023 14:14:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WBPvCS4oh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 33/38] fbdev/core: Move framebuffer and backlight helpers into separate files Date: Mon, 12 Jun 2023 16:08:11 +0200 Message-ID: <20230612141352.29939-34-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768508199224721944?= X-GMAIL-MSGID: =?utf-8?q?1768508199224721944?= 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 Mon Jun 12 14:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 106632 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2631819vqr; Mon, 12 Jun 2023 07:33:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6yS1Nz5swNDWKOSxyEkwoGAMzQfy4A4GHagIz/ytdQaBrCwuk3+LAgJ2G4VL8I7ALOjOXV X-Received: by 2002:a17:906:9b85:b0:96f:dd14:f749 with SMTP id dd5-20020a1709069b8500b0096fdd14f749mr8349663ejc.23.1686580420965; Mon, 12 Jun 2023 07:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686580420; cv=none; d=google.com; s=arc-20160816; b=C+7GWnHp4h9ADav8WCPc555SQSKTyf1K4ffYsPLGGsbRgZN9Ym398JE9UNR3506RdB HUeprpSeXzyZzkj2EUEQtWbMjpEyBhW85F6ARqejw0jqkobbL5F+A5roadXr8yp/S8vE 5wEVlU195dYRl68Ys4nobSwavQJYeH7D1/JHP1hpFMADnhmKQGhkPgOr1z767aHw4S0F FRvpfKE6wX/kFiH3JW96/H1FU42fsBHC/OQQ6kKMkg/MK9yUIOsaUK9Uwwjc0ZJBFUxB +uTXI8ZbOnG2cGIQIse5/5bfzAxCZr3s8ygrOZET5MJjYqodFPYjvFkCVfrSjhjA/7yD 87Dw== 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=cJZyjNOwYQoHbVrlw6qtebZPk+CJTUBPQCqoHfoIQlI=; b=yg84lq1k9AvA/tHvW+Jh7Gi0IA1STLxca1ygNOwDLgQP/isEQXX7LBQWxwdfLUvo9X AMGh79wVxzsSowBt7mI3R94MXTuW06B9f24HItn2OV15yGp8PzwX2q1pcPKoMpKkQTwF iiyIBsHlI5SLgIUEzsmnz4vSJptzmqVksexzCt+/WwbKX0vbG4LNO6aCbhHxoOmGwRFa VQIXw8ccppPS/an46G9l0xoClwv1q9wQLRt15BOifviIDBwSFDXII/JoBXLutK+702yC Lj98jM+N4S8RSg2t8H27IWpuLznU8KZTZDWJY2mlk769bqT+Dk3ZUr+rLnjW7M02cbx4 afew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=nGO2eer1; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=wsq2gFqr; 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 b17-20020a1709064d5100b0094ef9ad5770si5688578ejv.807.2023.06.12.07.33.13; Mon, 12 Jun 2023 07:33:40 -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=nGO2eer1; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=wsq2gFqr; 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 S233523AbjFLOQ0 (ORCPT + 99 others); Mon, 12 Jun 2023 10:16:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237590AbjFLOOc (ORCPT ); Mon, 12 Jun 2023 10:14:32 -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 56B7310D9; Mon, 12 Jun 2023 07:14: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 E8475203E7; Mon, 12 Jun 2023 14:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686579246; 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=cJZyjNOwYQoHbVrlw6qtebZPk+CJTUBPQCqoHfoIQlI=; b=nGO2eer1gSJqrO1RRtPneBZ4gSe4X9SM9UnQ7O4qb8hxBcT6j2NsHIGwZ/F5HmSM4mgHJZ 4L9l7WL6nNiZXjQfST+wJnpm9Re96pHOt+a8J1LlzSVW/PJxw8cCmeaBmwAXcUqKIM+jb9 IQ5g+9L2APZYhC7E0zD9lUCmlyfKYoM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686579246; 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=cJZyjNOwYQoHbVrlw6qtebZPk+CJTUBPQCqoHfoIQlI=; b=wsq2gFqrnbMnHngrRx9w4ay/NQkcTMxmLfTYcPvETAp92gGNxh5yU3oFAe8AJy/im0VJNZ hxNFLMIySYwrAjBA== 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 88DF01357F; Mon, 12 Jun 2023 14:14:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cJNPIC4oh2RwGQAAMHmgww (envelope-from ); Mon, 12 Jun 2023 14:14: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 v2 34/38] fbdev/core: Add fb_device_{create,destroy}() Date: Mon, 12 Jun 2023 16:08:12 +0200 Message-ID: <20230612141352.29939-35-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612141352.29939-1-tzimmermann@suse.de> References: <20230612141352.29939-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 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?1768507751191510117?= X-GMAIL-MSGID: =?utf-8?q?1768507751191510117?= 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