Message ID | 20230406143019.6709-16-tzimmermann@suse.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1072733vqo; Thu, 6 Apr 2023 07:33:16 -0700 (PDT) X-Google-Smtp-Source: AKy350bhQQijgK7v4b3tz2I9YfOq4wuhO8Wp0oPS+xB1IsqES1MQVogwMFMRXNKJmlUfx7W4psQ4 X-Received: by 2002:a17:907:6c17:b0:931:6f5b:d284 with SMTP id rl23-20020a1709076c1700b009316f5bd284mr6323473ejc.57.1680791596303; Thu, 06 Apr 2023 07:33:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680791596; cv=none; d=google.com; s=arc-20160816; b=vx3aBxXUFKo9d2s659ykDomio2uGa/3FH5wcMnrjHK8h/LlubHk63gMyMh1CXgZr3M Vpv0V+KJrWvQXTEcklYjyMx0eZLjv+I8vjvR/GjDbk+FsyikBhy+XOkTNyFPCvY6hQdv g2oAvAPh0Uo7oysOwuS/x0zpvmHmroMjQmjmauWQ1EE5XDdr/hh3Q6ZDYfrP8rQwY+6Y qCyoIQO+BUFVrIZWZANKLJy0RK68gXE+lVqhsPQeOtrrBS8fQtsUDcRcn1e1iGzA686I uH/ZgHL8hAhr5DbySGOWK9w3X5etOFE12ooStsi1J2KPGwmBl7E2F1lk9b0xLXs4KDYY iQPg== 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=q+mpH3lWZVvZZw0GybWkLSjYq5BHB3GhQ0nOupAiXow=; b=NXBs9O9UFIkUzDsKvK88StUXtw0KhtO12J2V9HhC7ihuNQbP1g03d1bsITwVdV73rH 1xS8RToVja+lUfwrI3CJahDlSFd7W3N39SvXXVsKuuBzZFvkK5CAoar9pQ3CedhlJ6B+ tQqHzcGUjIe+SedQk4798Cp3CU5mlk4gqWuHt4HAL9D+Nt7A2u1VTCFB5CoNf88l39ti 7IJNs5A/Px8nGTQ+WA8sVVeWv+6Y0D4laYfYLO/4gjLOviqWAk2CfZHMfKlke6LoX5wB rxqY6g9/1ecBaWJS0hI0BkmBy2ICv8pl6Cdaim1B9OTU31sazvN59AK3nHLFxAURAyMA SykA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=UxnzXeFO; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=iO1KHIOv; 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 qo24-20020a170907213800b009326a766050si496632ejb.663.2023.04.06.07.32.50; Thu, 06 Apr 2023 07:33:16 -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=UxnzXeFO; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=iO1KHIOv; 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 S239413AbjDFObs (ORCPT <rfc822;lkml4gm@gmail.com> + 99 others); Thu, 6 Apr 2023 10:31:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238873AbjDFOad (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 6 Apr 2023 10:30:33 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26F429779; Thu, 6 Apr 2023 07:30:29 -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 75E252277D; 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=q+mpH3lWZVvZZw0GybWkLSjYq5BHB3GhQ0nOupAiXow=; b=UxnzXeFODMJJDuqjyoc1E+ZiDj0weNshjPMaS+iJ3CCTdva4+xgdFRYRli8iX+/x0t6/Fk sGUdfOGT3Up18RS/0rfJPblcXVqHU6HmxEH5051pVV1Ojic8HcKm7PvteZOpKpDZWovCrv viJdQGq3yzKLlAPoXafQOPBF97xacWE= 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=q+mpH3lWZVvZZw0GybWkLSjYq5BHB3GhQ0nOupAiXow=; b=iO1KHIOvtsxPbMNd0a/ZQZhpo74giMMe6Hue8jyuBgHhKEbIhoT0UwDGX4J3iuP+WaHmcQ KqO9jBNOG1lT6hAQ== 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 113A013A1D; Thu, 6 Apr 2023 14:30:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kPIVA4PXLmS4LgAAMHmgww (envelope-from <tzimmermann@suse.de>); Thu, 06 Apr 2023 14:30:27 +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>, Michael Ellerman <mpe@ellerman.id.au>, Nicholas Piggin <npiggin@gmail.com>, Christophe Leroy <christophe.leroy@csgroup.eu> Subject: [PATCH v2 15/19] arch/powerpc: Implement <asm/fb.h> with generic helpers Date: Thu, 6 Apr 2023 16:30:15 +0200 Message-Id: <20230406143019.6709-16-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 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762437728936277968?= X-GMAIL-MSGID: =?utf-8?q?1762437728936277968?= |
Series |
arch: Consolidate <asm/fb.h>
|
|
Commit Message
Thomas Zimmermann
April 6, 2023, 2:30 p.m. UTC
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: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/fb.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
Comments
Thomas Zimmermann <tzimmermann@suse.de> writes: > 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: Michael Ellerman <mpe@ellerman.id.au> > Cc: Nicholas Piggin <npiggin@gmail.com> > Cc: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/include/asm/fb.h | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) Looks fine. Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) cheers > diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/fb.h > index 6541ab77c5b9..5f1a2e5f7654 100644 > --- a/arch/powerpc/include/asm/fb.h > +++ b/arch/powerpc/include/asm/fb.h > @@ -2,8 +2,8 @@ > #ifndef _ASM_FB_H_ > #define _ASM_FB_H_ > > -#include <linux/fb.h> > #include <linux/fs.h> > + > #include <asm/page.h> > > static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > @@ -13,10 +13,8 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > vma->vm_end - vma->vm_start, > 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_ */ > -- > 2.40.0
diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/fb.h index 6541ab77c5b9..5f1a2e5f7654 100644 --- a/arch/powerpc/include/asm/fb.h +++ b/arch/powerpc/include/asm/fb.h @@ -2,8 +2,8 @@ #ifndef _ASM_FB_H_ #define _ASM_FB_H_ -#include <linux/fb.h> #include <linux/fs.h> + #include <asm/page.h> static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, @@ -13,10 +13,8 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, vma->vm_end - vma->vm_start, 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_ */