From patchwork Fri Oct 6 14:41:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 149281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp379440vqo; Fri, 6 Oct 2023 07:42:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZHBeJWOVkDrL5JwwTQtKnc1BURtlphYFbK6gQuIBIGBdG9t220xcr+Z3FmRubfDxthT2n X-Received: by 2002:a05:6a00:1595:b0:68f:cb69:8e66 with SMTP id u21-20020a056a00159500b0068fcb698e66mr8681043pfk.15.1696603325868; Fri, 06 Oct 2023 07:42:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696603325; cv=none; d=google.com; s=arc-20160816; b=GUiHUP1bUPG8sgL4ZEZCemkQwNsMmLTXJK2dBW6hqsU6pzc04FTbxDkhDY6NAWYgjz PlSt0Fjdjr7BpaxIodRLScYBNeHIbGFri0qY8igIdCNDUbMjgjvC5BLH4EvynR5s1KIK eC2nwXgNzHNEaEiTn+0EFf6F0AsbCws7nJccSXTJVYtPE4pcrOWK8Uc/U9h1S29i52gB qY74wcNkEiXAQugirZTH6RBjl0FwmVp7WjuAqrt1SHAv+9mWPR7LH/LwHJPqAsDjIWjT mmlVfSMKPHJbmj4Wb+5VEIkmh31lf0EQU7AQQrzGVgyXzAj4pB/yOIU9TUm8EnSsoRWS ZXOw== 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; bh=Ls2OCbIxS5fedxEN3MB37F0qvuCulu3scJupSV+a/1k=; fh=sJfVPp9TpZpqbPKPLxG7q4Z2mBGbVYcKWDRgOiqd4Ug=; b=BQ79KyH+qHtqJ6EoLNy9RCmCVcre3WG96CGgQqUrw4MeUg5w3XvmflJl29REQfNGjO PO/fuMvaDAThf5VzLFHt092+LHe8U6TSrLhmwgHw59cFC7Saw9dhtu1Wdw4bRnlZZvjE gZ4n2VV6jKU3vWq6ZRUP6eoX75TzhWSr92doGyfWBEQt6O4CMvhShRWba72oMNTQpYi8 5bymKYED4SXYvkih0xKnu93KpBxZBG1yL27h08m/tAHXYj2F+w5Pt2uRGTHKTWtN1seF J/RQbRKA10gp7J1lpttmTjjvNUi9TjoSkH5pAmYrrGRYxMWYk+ESAyNeMzPfQsBdEzEl oDtg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id eg7-20020a056a00800700b0069344f0eda3si1631854pfb.5.2023.10.06.07.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 07:42:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 3CB1D805001C; Fri, 6 Oct 2023 07:42:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232599AbjJFOlg (ORCPT + 18 others); Fri, 6 Oct 2023 10:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230158AbjJFOlY (ORCPT ); Fri, 6 Oct 2023 10:41:24 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B9DDEB for ; Fri, 6 Oct 2023 07:41:21 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5e53:403c:300c:38ca]) by xavier.telenet-ops.be with bizsmtp id uehJ2A0090nPCdM01ehJXs; Fri, 06 Oct 2023 16:41:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qom10-005X4i-3t; Fri, 06 Oct 2023 16:41:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qom10-006v2Y-1I; Fri, 06 Oct 2023 16:41:18 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 4/5] m68k: Fix indentation by 2 or 5 spaces in Date: Fri, 6 Oct 2023 16:41:13 +0200 Message-Id: <2819709eee2be69c93497d4e97413bd0e05a9268.1696602993.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 06 Oct 2023 07:42:03 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779017529077062930 X-GMAIL-MSGID: 1779017529077062930 Indentation should use TABs, not spaces. Fix whitespace in reindented code while at it. Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/page_mm.h | 45 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 363aa0f9ba8ae691..e0ae4d5fc98596a4 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h @@ -13,17 +13,16 @@ #ifdef CPU_M68040_OR_M68060_ONLY static inline void copy_page(void *to, void *from) { - unsigned long tmp; - - __asm__ __volatile__("1:\t" - ".chip 68040\n\t" - "move16 %1@+,%0@+\n\t" - "move16 %1@+,%0@+\n\t" - ".chip 68k\n\t" - "dbra %2,1b\n\t" - : "=a" (to), "=a" (from), "=d" (tmp) - : "0" (to), "1" (from) , "2" (PAGE_SIZE / 32 - 1) - ); + unsigned long tmp; + + __asm__ __volatile__("1:\t" + ".chip 68040\n\t" + "move16 %1@+,%0@+\n\t" + "move16 %1@+,%0@+\n\t" + ".chip 68k\n\t" + "dbra %2,1b\n\t" + : "=a" (to), "=a" (from), "=d" (tmp) + : "0" (to), "1" (from), "2" (PAGE_SIZE / 32 - 1)); } static inline void clear_page(void *page) @@ -95,23 +94,23 @@ static inline void *__va(unsigned long paddr) #define __pa(x) ___pa((unsigned long)(x)) static inline unsigned long ___pa(unsigned long x) { - if(x == 0) - return 0; - if(x >= PAGE_OFFSET) - return (x-PAGE_OFFSET); - else - return (x+0x2000000); + if (x == 0) + return 0; + if (x >= PAGE_OFFSET) + return (x - PAGE_OFFSET); + else + return (x + 0x2000000); } static inline void *__va(unsigned long x) { - if(x == 0) - return (void *)0; + if (x == 0) + return (void *)0; - if(x < 0x2000000) - return (void *)(x+PAGE_OFFSET); - else - return (void *)(x-0x2000000); + if (x < 0x2000000) + return (void *)(x + PAGE_OFFSET); + else + return (void *)(x - 0x2000000); } #endif /* CONFIG_SUN3 */