From patchwork Sat May 23 16:38:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1296741 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Bho4mirc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Tq201kGRz9sPK for ; Sun, 24 May 2020 02:44:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 02C6281A66; Sat, 23 May 2020 18:41:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Bho4mirc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AE1BF81767; Sat, 23 May 2020 18:39:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C0908813A5 for ; Sat, 23 May 2020 18:39:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut@gmail.com Received: by mail-ed1-x541.google.com with SMTP id l25so11731688edj.4 for ; Sat, 23 May 2020 09:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2wdmGnBdgD3iAPP8TeN3LtV5NTQh8XtDx/ul2E5KtUY=; b=Bho4mirc6ERewmHzlI58daF/pfHw7zcJBlACKQuGSW8fykJKRUcHc68vEeubrOeLWs VHfF9dRkW07rEviPx23ow7Gb6AOFqYYi3cspzpxjJCV9v76P6+/2J5QnSiOQ4bidU1NS sIrYhU0jaOdA0Hlp/zmivWNbKv9fIreHZmKwFDUCHQSq0v46oOMJGxu5L+9VY4clPZeb 1KkGX3LiNZMOxuvH3aS4uiqaQD4ORbQYaJiB5UOTexoKbxPFSAA2v6Ku42Wzm+uCrMMs A/cUx8dbZ+EQzCpN1oJPYnb98BAaIt1Z4561taFweBqq0lJAjxypn0sbrb+HckBQYk4P LurQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2wdmGnBdgD3iAPP8TeN3LtV5NTQh8XtDx/ul2E5KtUY=; b=eixQnvp1mLmxVo2XCr9epXj1M9BFCxHmVKN6XyYEVDjnpNhN3Gfs+EJLzfXUD34esa ROVLkktdW529vcv79QhrzTTMORC4YoiNAQPcHHgRYtt9bD2zfMenIA+yHdtO0Uc/dhE+ bvFG+4CIx/ADvv9zMTq9xx8ZZFtGgNZ6/VrL9Oybv4Ui2CnQcesCCB68F3DXzaOOcBAz dSb3r59/w6YxRQQK6lCqXNNgXcxK4tYFbnTCTlMXZyTEwxd+lEFUsDde4KccQUIWajm8 xXlFryYjthdu04K1eeiv5HjNESizK33Ly/xW4bOeNeqwd94J0WnPCQ3iwu/ySAoPH4+a hKew== X-Gm-Message-State: AOAM530IzCbZNwFEm3YporXgjHI72n2xDWfDNN0vRmF4u/xb6dV4ETO+ BzqZsvk5XGn/B3mLF+vEzgJBAiuw X-Google-Smtp-Source: ABdhPJwqtLMBItazNxraFyQN9JXCKAAFWpZMBdHMn/5u5XHiTzBGW7DOEj/PaRAvj+kUrlvsSBTH2Q== X-Received: by 2002:a05:6402:8c1:: with SMTP id d1mr7824007edz.265.1590251963015; Sat, 23 May 2020 09:39:23 -0700 (PDT) Received: from desktop.lan (ip-86-49-35-8.net.upcbroadband.cz. [86.49.35.8]) by smtp.gmail.com with ESMTPSA id p25sm10456174eds.76.2020.05.23.09.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 09:39:22 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Cc: joe.hershberger@ni.com, Marek Vasut Subject: [PATCH 20/30] net: eepro100: Fix EE_*_CMD macros Date: Sat, 23 May 2020 18:38:27 +0200 Message-Id: <20200523163837.407592-20-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200523163837.407592-1-marek.vasut+renesas@gmail.com> References: <20200523163837.407592-1-marek.vasut+renesas@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Those macros depended on specific variable names to be declared at their usage sites, fix this by adding an argument to those macros and also protect the argument with braces. Signed-off-by: Marek Vasut Reviewed-By: Ramon Fried --- drivers/net/eepro100.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 861d39cf9f..a8d617c7e8 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -96,10 +96,10 @@ #define EE_DATA_BITS 16 /* The EEPROM commands include the alway-set leading bit. */ -#define EE_EWENB_CMD (4 << addr_len) -#define EE_WRITE_CMD (5 << addr_len) -#define EE_READ_CMD (6 << addr_len) -#define EE_ERASE_CMD (7 << addr_len) +#define EE_EWENB_CMD(addr_len) (4 << (addr_len)) +#define EE_WRITE_CMD(addr_len) (5 << (addr_len)) +#define EE_READ_CMD(addr_len) (6 << (addr_len)) +#define EE_ERASE_CMD(addr_len) (7 << (addr_len)) /* Receive frame descriptors. */ struct eepro100_rxfd { @@ -433,7 +433,7 @@ static int eepro100_txcmd_send(struct eth_device *dev, static int read_eeprom(struct eth_device *dev, int location, int addr_len) { unsigned short retval = 0; - int read_cmd = location | EE_READ_CMD; + int read_cmd = location | EE_READ_CMD(addr_len); int i; OUTW(dev, EE_ENB & ~EE_CS, SCB_EEPROM);