Message ID | 20230405150554.30540-16-tzimmermann@suse.de |
---|---|
State | Superseded |
Headers | show
Return-Path: <linux-fbdev-owner@vger.kernel.org> 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 C1A6CC7619A for <linux-fbdev@archiver.kernel.org>; Wed, 5 Apr 2023 15:07:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238919AbjDEPHJ (ORCPT <rfc822;linux-fbdev@archiver.kernel.org>); Wed, 5 Apr 2023 11:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238786AbjDEPGa (ORCPT <rfc822;linux-fbdev@vger.kernel.org>); Wed, 5 Apr 2023 11:06:30 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EECFB1FE3; Wed, 5 Apr 2023 08:06: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 A6E692292F; Wed, 5 Apr 2023 15:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1680707164; 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=IqaGH5bCZsBkFAvX5+Jzoaurz1526cXZUawazVolY3Q=; b=EAP2hhBEMX2UF+K5AbqBYOSUITL59YvwXjZFrjmYInGkSC4bQi8au2BakX+dRxADj7xmdW GRKIYKLRzicQVPkC5M+iRwI4GGnTQ/z4eKR5ne0cuSmCS27ScneZt9nig/LfRxHsl5IJmq R25KBEb9CmuOvwxMPWlEi/4W4wHb99U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1680707164; 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=IqaGH5bCZsBkFAvX5+Jzoaurz1526cXZUawazVolY3Q=; b=kNNFz7D/CQLsl5XIkod5cMLVFQn7XlNIkA+BukecWkwJilK/6k6pXzCCu8Q/GWiohvoYZF 9BCL8GQbB/lyVVAg== 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 3A09F13A92; Wed, 5 Apr 2023 15:06:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id iOb3DFyOLWTPIAAAMHmgww (envelope-from <tzimmermann@suse.de>); Wed, 05 Apr 2023 15:06:04 +0000 From: Thomas Zimmermann <tzimmermann@suse.de> To: arnd@arndb.de, daniel.vetter@ffwll.ch, deller@gmx.de, javierm@redhat.com, gregkh@linuxfoundation.org Cc: linux-arch@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org, Thomas Zimmermann <tzimmermann@suse.de>, Yoshinori Sato <ysato@users.sourceforge.jp>, Rich Felker <dalias@libc.org>, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Subject: [PATCH 15/18] arch/sh: Implement <asm/fb.h> with generic helpers Date: Wed, 5 Apr 2023 17:05:51 +0200 Message-Id: <20230405150554.30540-16-tzimmermann@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230405150554.30540-1-tzimmermann@suse.de> References: <20230405150554.30540-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-fbdev.vger.kernel.org> X-Mailing-List: linux-fbdev@vger.kernel.org |
Series |
arch: Consolidate <asm/fb.h>
|
expand
|
diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h index 9a0bca2686fd..1e7b1cfd5b5e 100644 --- a/arch/sh/include/asm/fb.h +++ b/arch/sh/include/asm/fb.h @@ -2,19 +2,17 @@ #ifndef _ASM_FB_H_ #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h> #include <asm/page.h> +struct file; + static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) { vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); } +#define fb_pgprotect fb_pgprotect -static inline int fb_is_primary_device(struct fb_info *info) -{ - return 0; -} +#include <asm-generic/fb.h> #endif /* _ASM_FB_H_ */
Replace the architecture's fb_is_primary_device() with the generic one from <asm-generic/fb.h>. No functional changes. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Rich Felker <dalias@libc.org> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> --- arch/sh/include/asm/fb.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)