| Message ID | 20230405150554.30540-14-tzimmermann@suse.de |
|---|---|
| State | New |
| Headers | show
Return-Path: <SRS0=s6WS=74=vger.kernel.org=sparclinux-owner@ozlabs.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@legolas.ozlabs.org
Authentication-Results: legolas.ozlabs.org;
spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org
(client-ip=2404:9400:2221:ea00::3; helo=gandalf.ozlabs.org;
envelope-from=srs0=s6ws=74=vger.kernel.org=sparclinux-owner@ozlabs.org;
receiver=<UNKNOWN>)
Authentication-Results: legolas.ozlabs.org;
dkim=pass (1024-bit key;
unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256
header.s=susede2_rsa header.b=a+wU+LVq;
dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256
header.s=susede2_ed25519 header.b=sIpTkBX4;
dkim-atps=neutral
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature ECDSA (P-384))
(No client certificate requested)
by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ps7Jk1Crrz1yZT
for <incoming@patchwork.ozlabs.org>; Thu, 6 Apr 2023 01:07:02 +1000 (AEST)
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by gandalf.ozlabs.org (Postfix) with ESMTP id 4Ps7Jk0kh9z4xG5
for <incoming@patchwork.ozlabs.org>; Thu, 6 Apr 2023 01:07:02 +1000 (AEST)
Received: by gandalf.ozlabs.org (Postfix)
id 4Ps7Jk0V0Yz4xGD; Thu, 6 Apr 2023 01:07:02 +1000 (AEST)
Delivered-To: patchwork-incoming@ozlabs.org
Authentication-Results: gandalf.ozlabs.org;
dmarc=pass (p=none dis=none) header.from=suse.de
Authentication-Results: gandalf.ozlabs.org;
spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org
(client-ip=2620:137:e000::1:20; helo=out1.vger.email;
envelope-from=sparclinux-owner@vger.kernel.org; receiver=<UNKNOWN>)
Authentication-Results: gandalf.ozlabs.org;
dkim=pass (1024-bit key;
unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256
header.s=susede2_rsa header.b=a+wU+LVq;
dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256
header.s=susede2_ed25519 header.b=sIpTkBX4;
dkim-atps=neutral
Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20])
by gandalf.ozlabs.org (Postfix) with ESMTP id 4Ps7Jk0MGdz4xG5
for <patchwork-incoming@ozlabs.org>; Thu, 6 Apr 2023 01:07:02 +1000 (AEST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S238788AbjDEPHB (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);
Wed, 5 Apr 2023 11:07:01 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53708 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S238707AbjDEPGS (ORCPT
<rfc822;sparclinux@vger.kernel.org>); Wed, 5 Apr 2023 11:06:18 -0400
Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C93324C17;
Wed, 5 Apr 2023 08:06: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 AA94122928;
Wed, 5 Apr 2023 15:06:03 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;
s=susede2_rsa;
t=1680707163;
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=MGwV+C2zhRavo4V9t/lCv4GV6nwBEOvq18lFk5ZhtVo=;
b=a+wU+LVqsagcS1piEEmYcVYGFgVuoaA9NqKogh+pJC58CCXt+j09yOAlEAU/m6BKssOekt
PCct5nD5rOLwcVA0WooNC8SFnkF/3niZCO3xUy8W+//2p409HrjRHC2RwMRKyETvTsMAs7
GzbJ//Du9iXnFUJbojkkkTSBz1yaqHc=
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;
s=susede2_ed25519; t=1680707163;
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=MGwV+C2zhRavo4V9t/lCv4GV6nwBEOvq18lFk5ZhtVo=;
b=sIpTkBX4oIzLnz2RKx8r1vZ+bxqQC219fma1Ea7uOPfJSU8nmtCzBe7PDoBI1fVi9NPmBK
3NBnXsjjTcvyv6CA==
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 4CFBD13A92;
Wed, 5 Apr 2023 15:06:03 +0000 (UTC)
Received: from dovecot-director2.suse.de ([192.168.254.65])
by imap2.suse-dmz.suse.de with ESMTPSA
id wBwHEluOLWTPIAAAMHmgww
(envelope-from <tzimmermann@suse.de>); Wed, 05 Apr 2023 15:06:03 +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>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Subject: [PATCH 13/18] arch/parisc: Implement <asm/fb.h> with generic helpers
Date: Wed, 5 Apr 2023 17:05:49 +0200
Message-Id: <20230405150554.30540-14-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
X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS
autolearn=unavailable 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: <sparclinux.vger.kernel.org>
X-Mailing-List: sparclinux@vger.kernel.org
|
| Series |
arch: Consolidate <asm/fb.h>
|
expand
|
diff --git a/arch/parisc/include/asm/fb.h b/arch/parisc/include/asm/fb.h index 0b9a38ced5c8..66bb401c0cda 100644 --- a/arch/parisc/include/asm/fb.h +++ b/arch/parisc/include/asm/fb.h @@ -2,23 +2,24 @@ #ifndef _ASM_FB_H_ #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h> #include <asm/page.h> +#include <asm/pgtable.h> + +struct fb_info; +struct file; static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) { pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; } +#define fb_pgprotect fb_pgprotect #if defined(CONFIG_STI_CORE) int fb_is_primary_device(struct fb_info *info); -#else -static inline int fb_is_primary_device(struct fb_info *info) -{ - return 0; -} +#define fb_is_primary_device fb_is_primary_device #endif +#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> on systems without CONFIG_STI_CORE. No functional changes. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> --- arch/parisc/include/asm/fb.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)