From patchwork Wed Aug 31 17:27:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 664630 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 3sPXRN2LS5z9srZ for ; Thu, 1 Sep 2016 03:28:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=S+n8mnG2; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936000AbcHaR2W (ORCPT ); Wed, 31 Aug 2016 13:28:22 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34763 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935925AbcHaR2U (ORCPT ); Wed, 31 Aug 2016 13:28:20 -0400 Received: by mail-pa0-f65.google.com with SMTP id hh10so2920518pac.1; Wed, 31 Aug 2016 10:27:52 -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=4rt2iC2tHl9lCIaXc9ndblhJKQAibttfs4Xep/CkgJY=; b=S+n8mnG26P0XJs4VKFS7+GvO8UOQkrHC0s4b2XJ3xcRPsPYVESZIeg5MUV3Ij8myJm dvLcQqy+hbtgBIXN4LBo2nIXacNU939dbBJclJV9mud6bW+d+ieVceyg/mDih11IcOlp 1TjAk9xNV/bdIVAnVUgiEgtCGQkoH7C4/K6yOcEduK3p+NNo5pUU1tGnppUo6qt3D1Ka B3/BR6Ws1IRRQeXzyzYUkBk5ffsT/qRjUNbQWLqAjdeHN/q3/5qMgcPZddm05BqJw27g 1idgSik0s6eGy7aK5gtWiojhIqzevmx46rKUynTk2AjiH+QMIQosEzBHbMfG7U4lCigg 6UeQ== 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=4rt2iC2tHl9lCIaXc9ndblhJKQAibttfs4Xep/CkgJY=; b=dl6INd76OPgXs2cvPamNYhfmyjxW6k1sPa8m/kaEp47DZQLwlpxsI9aT7v6g2CUp2D Lf2QiMVLRQXmJkvfD5ZUC5v4inl45gVs4FNoSPNsC0Tk8X84ANrmMp7yEQ0IbWuhrFym Rg/jSQmLRv/EShBMFK3NxeQ0MejE+x1Rjkf3qNMJXwYYwok2PGgfnkf3xv1iZreVV9ck aEgKZfWNWbH07D5lEXEXHxSgRvCBt/EzcKxlg9cncXPEdGpjFit+iGDXUhIjk68ekuZg TMWIZZNEdCGnkCHAzw5gP/E2OW0icipyWbBGKKfwq3CuJdcty/j3Uel11lCFJTJuW44b ZRKA== X-Gm-Message-State: AE9vXwPAjnGwYo7iE+WYVqOCIulKQsIVGnSMuyynt1qD+4rrWyPYxQN9Nv2jlWpdYaL7GQ== X-Received: by 10.66.219.200 with SMTP id pq8mr18887964pac.75.1472664471517; Wed, 31 Aug 2016 10:27:51 -0700 (PDT) Received: from localhost.localdomain ([103.24.124.194]) by smtp.gmail.com with ESMTPSA id h9sm1175214pac.5.2016.08.31.10.27.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Aug 2016 10:27:50 -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] net: smsc: remove build warning of duplicate definition Date: Wed, 31 Aug 2016 22:57:39 +0530 Message-Id: <1472664459-26169-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 --- m32r allmodconfig build of next-20160825 is at: https://travis-ci.org/sudipm-mukherjee/parport/jobs/154943795 drivers/net/ethernet/smsc/smc91x.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index 1a55c79..0b0bb74 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h @@ -445,7 +445,14 @@ smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma, #endif #if ! SMC_CAN_USE_8BIT +#ifdef SMC_inb +#undef SMC_inb +#endif #define SMC_inb(ioaddr, reg) ({ BUG(); 0; }) + +#ifdef SMC_outb +#undef SMC_outb +#endif #define SMC_outb(x, ioaddr, reg) BUG() #define SMC_insb(a, r, p, l) BUG() #define SMC_outsb(a, r, p, l) BUG()