From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D034CC00144 for ; Fri, 29 Jul 2022 08:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235610AbiG2IO3 (ORCPT ); Fri, 29 Jul 2022 04:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235558AbiG2IOX (ORCPT ); Fri, 29 Jul 2022 04:14:23 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62F928210D for ; Fri, 29 Jul 2022 01:14:17 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id z22so4901499edd.6 for ; Fri, 29 Jul 2022 01:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=aC62YFpOcEgWM0eoM1eba1ujgEXycmF9AE85pHvVPYo=; b=KsTgxSJ5gv51eJV6HUga21BewB811m0hye/yDxqPfcv+IsH9dsaAFdaFCn/3cLUkAQ pQa1QGAJn8i0QDTBw/kfIzKFM8l9lOWFgSsn+q0cCeFvfxi9f8X7Fvx6DwvG40GBZOYF noG+BiV92KwzXJGhqjd/d+7wFERUUSaL3PIj85vfPo9wXIm6AtyfIWiP8L1Il2OMKWBq vv3gi3rcXALPivyf0n7D3XVSeP30PmaD/NiJCwd3XQALvbQiTTwtOFnqenglq3lhISIP mz5w9Rys0+Q8kae/Wrc4lUMtTNau7JXzCXFVooxvR4eenDhlpXgeL3O0zAvW9jOJuRSc jPvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=aC62YFpOcEgWM0eoM1eba1ujgEXycmF9AE85pHvVPYo=; b=Fa28qyTOLBR2dhn95pHz78qlpEnJ6OBJ9sZJJaxMsUWwQiUYrB0QJVHqia00YMUcGV PbMZRgf/zqzAWXrRPE2hldaUvAFeEgPFdmNoRiB5MLc1UzHKwoU4u0wLHcUDicdbRzzB sTlinC8XP3AdK3IVVqhzwxe/BwybzIS3oLpftDOsjcePz3Xj5Pu+j0R7ucaOZyx49hNP 3WsEvcijDUQsAbtpA05Xq7eXB7H3mh0amNSH2XCuMt/zQEzCK8yTOz24Jfm55pqSuGKs skzbmht0gfF9CsLcGF14i1OqoY9zS7/KFZvm+ePi0VQyh5QiMMXMNjSKjBdu5aXeBenh sovQ== X-Gm-Message-State: AJIora/RUPqO9iYEQga6gq7Xgt+p9DyeuLdWcEYZq8sE5JY35cwaH4O2 rdog+aG3IzS9fIZVNApcXKY= X-Google-Smtp-Source: AGRyM1uitipKu6Ae5L9nGXPf52ek+oE/jutXwoIVEw+HWNBWNxcMSs5gLjcTG6/skZ+sYiL+EdoslA== X-Received: by 2002:a05:6402:3511:b0:43b:c84c:e233 with SMTP id b17-20020a056402351100b0043bc84ce233mr2402327edd.211.1659082456016; Fri, 29 Jul 2022 01:14:16 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id 16-20020a170906311000b0072b13a10477sm1375609ejx.108.2022.07.29.01.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 01:14:15 -0700 (PDT) Date: Fri, 29 Jul 2022 10:14:14 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] staging: vt6655: Convert macro MACvReceive0 to function Message-ID: <059aca149bd0c1d75df4fb3cd8a177aa4948fb02.1659080988.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert macro to static function. Multiline macros are not liked by kernel community. Rename variable dwData to reg_value to avoid CamelCase which is not accepted by checkpatch.pl. Change variable declaration to u32 as this improves readability. Signed-off-by: Philipp Hortmann --- V1 -> V2: Combind patch "Rename dwData to reg_value ..." with this one Changed order of renaming function and conversion to function Removed function declaration Changed variable declaration Improved patch description --- drivers/staging/vt6655/device_main.c | 11 +++++++++++ drivers/staging/vt6655/mac.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 92583ee8bffd..39bfbb1ab742 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -205,6 +205,17 @@ static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr) iowrite8(0, iobase + MAC_REG_PAGE1SEL); } +static void MACvReceive0(void __iomem *iobase) +{ + u32 reg_value; + + reg_value = ioread32(iobase + MAC_REG_RXDMACTL0); + if (reg_value & DMACTL_RUN) + iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0); + else + iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0); +} + /* * Initialisation of MAC & BBP registers */ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 0122c4603c66..d21313f3067e 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,16 +537,6 @@ /*--------------------- Export Macros ------------------------------*/ -#define MACvReceive0(iobase) \ -do { \ - unsigned long dwData; \ - dwData = ioread32(iobase + MAC_REG_RXDMACTL0); \ - if (dwData & DMACTL_RUN) \ - iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0); \ - else \ - iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0); \ -} while (0) - #define MACvReceive1(iobase) \ do { \ unsigned long dwData; \ -- 2.37.1