From patchwork Fri Jul 28 16:40:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 708193 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CD1DC04E69 for ; Fri, 28 Jul 2023 18:25:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236820AbjG1SZj (ORCPT ); Fri, 28 Jul 2023 14:25:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231902AbjG1SZQ (ORCPT ); Fri, 28 Jul 2023 14:25:16 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDF7246B1; Fri, 28 Jul 2023 11:24:54 -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 A20D41F8C0; 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=Qx6orVKx6/Oz/Kb2MA4RpUrgBMlSqgcuiuE/9y2HpfU=; b=uEI13op5kanJnRQEKXNyIGUYkGFRdosnl+0ZbxhIm86gHA3s7DOrWsQ5SX+HwFUdADB/ha WTw5SZF6tv3DdkCuSc1l6CNExXlLeoHscruq11UNI5fQZFQ0n5MAySUShyHgPkbKGyM4r5 HPEY0EiY2nqXEv1tcoMFTW+Pck85QBw= 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=Qx6orVKx6/Oz/Kb2MA4RpUrgBMlSqgcuiuE/9y2HpfU=; b=pln4VYFZMTQj+G2200tAMZjm2/R5EHefgED+izo5vOMGSu1IBvB94RMXPfz9o1Qn1b+8Np mt08Ez0wW9MpxqBg== 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 7395D139BD; 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 UPF6G3QHxGQ3CwAAMHmgww (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 35/47] fbdev/pxafb: Use fbdev I/O helpers Date: Fri, 28 Jul 2023 18:40:18 +0200 Message-ID: <20230728182234.10680-36-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 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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/pxafb.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index bf8261e0f347..a085e81276f4 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1580,9 +1580,7 @@ config FB_PXA168 config FB_PXA tristate "PXA LCD framebuffer support" depends on FB && ARCH_PXA - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_IO_HELPERS select VIDEOMODE_HELPERS if OF select FB_MODE_HELPERS if OF help diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c index beffb0602a2c..ffff4275215f 100644 --- a/drivers/video/fbdev/pxafb.c +++ b/drivers/video/fbdev/pxafb.c @@ -599,13 +599,11 @@ static int pxafb_blank(int blank, struct fb_info *info) static const struct fb_ops pxafb_ops = { .owner = THIS_MODULE, + FB_DEFAULT_IO_OPS, .fb_check_var = pxafb_check_var, .fb_set_par = pxafb_set_par, .fb_pan_display = pxafb_pan_display, .fb_setcolreg = pxafb_setcolreg, - .fb_fillrect = cfb_fillrect, - .fb_copyarea = cfb_copyarea, - .fb_imageblit = cfb_imageblit, .fb_blank = pxafb_blank, };