From patchwork Thu Apr 6 14:30:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 80271 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1072632vqo; Thu, 6 Apr 2023 07:33:08 -0700 (PDT) X-Google-Smtp-Source: AKy350Yz5ElAJoZ9D7y6YhQKYlLzNguvxBOMO8raBbSqY7vhYasH14bBrIB7EqmObwwHVGUrZksh X-Received: by 2002:a17:906:9602:b0:933:32a9:bfb2 with SMTP id s2-20020a170906960200b0093332a9bfb2mr6935528ejx.57.1680791588687; Thu, 06 Apr 2023 07:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680791588; cv=none; d=google.com; s=arc-20160816; b=rpBsE0phTmJpCHADV7A34RwNDs/zNh6wCbJX3qW07de8OkVM0oNjgoogmXk/yHfXsD Lm2kNIyqr+DtrkcbOI2b8tVEKWr/CgWkGW5/9TtkiQTYt2pMnWYvNU5NA1CdmsCO1ut1 3wqtvAEn9xXLbsCaHovxyTXNcH6yhQrL/w/ts4J/mSIZsron+BAp9+bxlpEoFfp72EW4 +UkzW8z7tR5cR9XwilmgWjf+mCZdQaqUnQg4ov/IdaD4LCKIfBY3Euo1Y57SZTP8KlIV uWscOMAxSQ0JDjV2mhxzzN4TMJuYWk7+/ZG1G1BQpJVorSZw0V4fT2b7R5KDxOxb8C7D y3oA== 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=MGwV+C2zhRavo4V9t/lCv4GV6nwBEOvq18lFk5ZhtVo=; b=ZndU5jHYPIlG7/rO0tLko+WarCLr+X8C93Pd5HNVbVuwuH7LaDNM+alAHO+xRNik+n WST47QrXN8+ByPwWea2jvCbYP9mG3GgMe7purF+fftOujYQfslVOfAQabYNDgJeqGRh5 sJ79MdD71gNIal+C9Pgto+TXR8uvqiftdDF8bbA3yqxegZXpZh/IPZSMywK42cuZuKnl E0ggd6tJksgnuGNv9rkxfKsH88NqlXk29d2izs5weCZjKcHagVm9UYztA/8io2UvUEp2 wWw+O57TXGv5/wxv/hyAf3LGZrSPO4s3s63HfEk+yUVLe4eTVz828cUtZ+w/gFkfGXvV gPcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="GKU/yERB"; 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 nb11-20020a1709071c8b00b00949cb6ab3aesi1306329ejc.520.2023.04.06.07.32.42; Thu, 06 Apr 2023 07:33: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="GKU/yERB"; 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 S239286AbjDFObb (ORCPT + 99 others); Thu, 6 Apr 2023 10:31:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239147AbjDFOad (ORCPT ); Thu, 6 Apr 2023 10:30:33 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77B6D9768; Thu, 6 Apr 2023 07:30:28 -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 0B7D32277B; Thu, 6 Apr 2023 14:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1680791427; 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=GKU/yERBLXSqa5Xw2kqzBrOQelvJeFn5od+onZY12mRvTfwt5PaFS3YELo5aGzPuzWZHWG AAtYtZ5y0f3X9RST1b72uM2aZF8DkObL60lfnnyEE+lmWBNERqzNSM53uESvVbRPA42YSu Tu3yENRAw8hMVD3tHQ4EDfSCzokSQ2c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1680791427; 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=fQjMTaVbRk7nSIWp3Vp/7VuQziMxR3bGoTEpQnNHoVSgZ3BpeGJvaV3PJX38cgp5X1QCBR xKBnkSkW1Ip+aHDg== 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 A88541351F; Thu, 6 Apr 2023 14:30:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sJJOKILXLmS4LgAAMHmgww (envelope-from ); Thu, 06 Apr 2023 14:30:26 +0000 From: Thomas Zimmermann 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 , "James E.J. Bottomley" Subject: [PATCH v2 14/19] arch/parisc: Implement with generic helpers Date: Thu, 6 Apr 2023 16:30:14 +0200 Message-Id: <20230406143019.6709-15-tzimmermann@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230406143019.6709-1-tzimmermann@suse.de> References: <20230406143019.6709-1-tzimmermann@suse.de> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762437720629666034?= X-GMAIL-MSGID: =?utf-8?q?1762437720629666034?= Replace the architecture's fb_is_primary_device() with the generic one from on systems without CONFIG_STI_CORE. No functional changes. Signed-off-by: Thomas Zimmermann Cc: "James E.J. Bottomley" Cc: Helge Deller --- arch/parisc/include/asm/fb.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 -#include #include +#include + +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 + #endif /* _ASM_FB_H_ */