From patchwork Sun Sep 4 17:32:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 665534 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sS0LT2v9Mz9sdg for ; Mon, 5 Sep 2016 03:32:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=YmCG09KB; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753640AbcIDRcd (ORCPT ); Sun, 4 Sep 2016 13:32:33 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35206 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751539AbcIDRcc (ORCPT ); Sun, 4 Sep 2016 13:32:32 -0400 Received: by mail-pf0-f196.google.com with SMTP id h186so8466317pfg.2; Sun, 04 Sep 2016 10:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=I/q+lA6lnIkCmzwI00W2mZSLCqXAguPjCTQPRHKnuTI=; b=YmCG09KB4w36hO2bRxtunYTf86JxlYlwnS+oUtckfRWRV1pXHxsdkOa72kIdb9ElW+ XZ9RHZ+Mng7xqX7FOGLvkcdlqmCZ1YMYXz8a9UmjWhUQD2VYrO831m4AjRRnGvtuqm8R p2dPajupKnej4rEHfjdJTtSzN0/+i69saJxjvq7O3DhT4XYwrq9qwa2aVmnt2POV0PG3 x2bC55RPGLtRtt2I1h3buovFcoWxYy5wWkPjXSrD6t4HBABxT3LkY4ZtXM7WmuUq6A3/ yHukkxJaVYgLvd/0XSASzKzsB2UkYBRsthL3JWzIWrOewhf9nIsP2UpBUCxVdOyDK+NJ aWYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=I/q+lA6lnIkCmzwI00W2mZSLCqXAguPjCTQPRHKnuTI=; b=aIK9F3nKjD2fQx827Iu7+iIgTlUU5KRKlh0U3jqf8suKWwljKEWv+FLSeLA7G3GIux WQiGFxewSNHYIuBZAGoy8OrnDHrVKX1mCfqRW7nRX81kpjKp7aNH2tBvDOFKKvwcxeOS 1Mmu9KY/QFfb5rDXtlYe3Rj1pI2Fbvfg92Ag7YWOqURdZf3nR2kDlDUu2ojfdk28xSC3 Tzo+Z/IQGCYCvh3g3bUWrh5GrOnTYO2CYha2NUoBFjDq7pBYv4JCKOn5+xNScD82hEZs brQeG93VmH/4y7xc4zCwxQ+UsM5FAig/IZ636MYDKWvA3GL2HOQyYNpYjm+U6aa0/7pD fS0g== X-Gm-Message-State: AE9vXwOjec7nMlkYzTht2LVyRpFSXr8sser8pq4tzxYJPiUH9gGBGKdSZYXRdYP0FO7XRA== X-Received: by 10.98.103.71 with SMTP id b68mr20911600pfc.30.1473010351759; Sun, 04 Sep 2016 10:32:31 -0700 (PDT) Received: from localhost.localdomain ([103.24.124.194]) by smtp.gmail.com with ESMTPSA id 67sm22919804pfy.80.2016.09.04.10.32.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Sep 2016 10:32:30 -0700 (PDT) From: Sudip Mukherjee To: Nicolas Pitre , "David S. Miller" Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Sudip Mukherjee Subject: [PATCH v2] net: smsc: remove build warning of duplicate definition Date: Sun, 4 Sep 2016 23:02:21 +0530 Message-Id: <1473010341-10359-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The build of m32r was giving warning: In file included from drivers/net/ethernet/smsc/smc91x.c:92:0: drivers/net/ethernet/smsc/smc91x.h:448:0: warning: "SMC_inb" redefined #define SMC_inb(ioaddr, reg) ({ BUG(); 0; }) drivers/net/ethernet/smsc/smc91x.h:106:0: note: this is the location of the previous definition #define SMC_inb(a, r) inb(((u32)a) + (r)) drivers/net/ethernet/smsc/smc91x.h:449:0: warning: "SMC_outb" redefined #define SMC_outb(x, ioaddr, reg) BUG() drivers/net/ethernet/smsc/smc91x.h:108:0: note: this is the location of the previous definition #define SMC_outb(v, a, r) outb(v, ((u32)a) + (r)) Signed-off-by: Sudip Mukherjee --- v2: +#ifdef of v1 is removed. drivers/net/ethernet/smsc/smc91x.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index 1a55c79..06d7dca 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h @@ -445,7 +445,9 @@ smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma, #endif #if ! SMC_CAN_USE_8BIT +#undef SMC_inb #define SMC_inb(ioaddr, reg) ({ BUG(); 0; }) +#undef SMC_outb #define SMC_outb(x, ioaddr, reg) BUG() #define SMC_insb(a, r, p, l) BUG() #define SMC_outsb(a, r, p, l) BUG()