From patchwork Fri Jul 28 16:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13332546 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C180C001DE for ; Fri, 28 Jul 2023 18:27:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eJ8uhWg7JxU6/ilZxDD9d20SW0a43TrXERPjFoHZgjI=; b=LX/t7zaikW4fNJ NPBDZuUPcAkhYykC/Z+i1had9Hvsojg2/deUZPNlYUNeOjGQXfn5p9cVQa4qW/NE3StEgJ7N3TJKD xGtUORJyiiH0DrJ4KFurGak+xuedZy+d7D9KSCyzqPANgPlWqdvPYD3SMXdh4C4kaGJ3IfONPFC14 kTIxsHl7EU3S0/HjwHKWSIXh37CX1dqm9GUIetithgXOwEo4hHjPjynzv96xZYVDOEgpxN9rGG9Kx J7MBfnyfaIPDXhKryBN6nicjiMPZdzn2ChdvYgynla+DORJyxihbk1AXV0kEFH+lvnKTZnToDmzZW JxRjX8xnEAPTHTnVEJvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qPSAi-004WEr-2l; Fri, 28 Jul 2023 18:26:40 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qPS75-004TyN-0p; Fri, 28 Jul 2023 18:22:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=4OUrrcgXyoPtms8129kLJuIQWu/MMVPehHLir/xXNZk=; b=f1rpUAmLXJODIY2P+nOQIqDJzC cJaX8iQdf9bK5vDKGrdexzq5rX/SOgcccIjpSSdJU7C0Zt1x9Co316jZ65Hv0Poaoe/EiJf3QR8Mq yhTd+User2+l0T68fJ98rQyQQWWmxCIQxN383sLXo3lGrh9nt9XXJzsqiYkoNXyUMR2JOgpZiy+BM HjeNVa3GlFPtVCYS87icdZ4ckX9806f+F4GeSaHDyU0yROtgv8JZRo7MikJPd2tDL96MRYj7WNdG/ p8GRvxoNo79GJrGh6nY9YIrybA39wtOEkqA4eiydf3j2tpBOkE23yfeyWBDhC6FZwZkuLnx19i32J 0BVBZWNw==; Received: from smtp-out1.suse.de ([195.135.220.28]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qPS70-008RxG-1n; Fri, 28 Jul 2023 18:22:53 +0000 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 D215C219A1; Fri, 28 Jul 2023 18:22:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690568564; 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=4OUrrcgXyoPtms8129kLJuIQWu/MMVPehHLir/xXNZk=; b=xDnGd60/keIT0eI8H1T4hX8Shvx4EtAX/EYCgfgGuO8L1v/DfhP+oDth+iH1kPcPyqUZEI qgr4/0ao4JW0npGHC3JLcLvc6mJxhkYcLnYDKxG62D5aPxCiqmE8S46K4JRPg0u9MgIJ2I Xv7rXxOpsCDm13Gz/f2TJ8HFOhT60/c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690568564; 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=4OUrrcgXyoPtms8129kLJuIQWu/MMVPehHLir/xXNZk=; b=9bsrl3EmIo6tWkpaxzS4IC56xCnD1Jy7nZ5sPRdiuuL3WVbnA5jF5Oa7ah01T3BLnwyKvP sHnQZTPVeVfaV7AA== 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 A4EFF13276; Fri, 28 Jul 2023 18:22:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mCN8J3QHxGQ3CwAAMHmgww (envelope-from ); Fri, 28 Jul 2023 18:22:44 +0000 From: Thomas Zimmermann To: deller@gmx.de, javierm@redhat.com, sam@ravnborg.org Cc: linux-media@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-geode@lists.infradead.org, linux-omap@vger.kernel.org, kvm@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 36/47] fbdev/q40fb: Use fbdev I/O helpers Date: Fri, 28 Jul 2023 18:40:19 +0200 Message-ID: <20230728182234.10680-37-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728182234.10680-1-tzimmermann@suse.de> References: <20230728182234.10680-1-tzimmermann@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230728_192251_839508_A3A86536 X-CRM114-Status: GOOD ( 10.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Set struct fb_ops and with FB_DEFAULT_IO_OPS, fbdev's initializer for I/O memory. Sets the callbacks to the cfb_ and fb_io_ functions. Select the correct modules with Kconfig's FB_IO_HELPERS token. The macro and token set the currently selected values, so there is no functional change. Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/Kconfig | 4 +--- drivers/video/fbdev/q40fb.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index a085e81276f4..f49a407a6f6a 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -222,9 +222,7 @@ config FB_Q40 bool depends on (FB = y) && Q40 default y - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_IO_HELPERS config FB_AMIGA tristate "Amiga native chipset support" diff --git a/drivers/video/fbdev/q40fb.c b/drivers/video/fbdev/q40fb.c index b180f0f6940e..e402d1de3218 100644 --- a/drivers/video/fbdev/q40fb.c +++ b/drivers/video/fbdev/q40fb.c @@ -76,10 +76,8 @@ static int q40fb_setcolreg(unsigned regno, unsigned red, unsigned green, static const struct fb_ops q40fb_ops = { .owner = THIS_MODULE, + FB_DEFAULT_IO_OPS, .fb_setcolreg = q40fb_setcolreg, - .fb_fillrect = cfb_fillrect, - .fb_copyarea = cfb_copyarea, - .fb_imageblit = cfb_imageblit, }; static int q40fb_probe(struct platform_device *dev)