Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1187577ybn; Wed, 2 Oct 2019 12:09:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1a0c1tGxUjW1dGAgpSeCR6R7u3Jj3sR0L9K1eFjJPr260nZtQgu8Z32rWU86NomyTMRgS X-Received: by 2002:aa7:d654:: with SMTP id v20mr5613531edr.46.1570043344856; Wed, 02 Oct 2019 12:09:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570043344; cv=none; d=google.com; s=arc-20160816; b=y0x7G7mnzdQtur7aktiTDwuRYS9czJkTgmYW2gL3cijh3OYkYrD0CBdGkIwtYRmnqb Rcuu912F6NdMNX+WjGK4e3GfMteWRfzdGfrbUyuQ32DqO7jk5Dy3mhXtHV74ijHl0zFR dJdBlHpNfXhKUdeIx3ajKyhyeoKFedTzrKvYclu5RTE3lWv6Xj54v7opRaLqd16fKASr uIfH8FyPdabd7m8UImt568OChHiREzwWcbg4whiWAmGR3lF4G0/Pjvjoxkvq1ZikvO38 lQMSwR+SQ02Nr7NITY4+zVtEDQ9G277oOYX+Yl4Iv6gjeTbo0L+lAbTdh/d+yRGQSxBi nEsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=RzZJBX3gmcpJa6qajmau3b/7qjIkQONofnfaTDM+mQY=; b=XTLPibKjFBwxudhZ01tgRPsx/oPu0n+tb2iwwFiVxi548Q4Lr0yXGaZUnzUvpC/jzV u49dujMXJe7cQlcj3ylQaZTSGWTvNzBH1+aFEuZ5vDhNhnkbBpOk5mGVj3zYv4w89xrd bwOC7xvNwJaElEXac2aCr6q3dTSLv4A22rjNsttX0cAm99UD0AQ1CpFE2ItXnA0XsNgX o2bJAz3Srb74DZxPbQGkQ5B2w7eCoWZdJcDRlfDk+035lYfsnBy5spKYmYdsSgTJZCJC gz5TNc/1M88TUg5jPn4t/dNsn/cMmz1ddhlQU28D7HxeFQBvFjKdb+DRztVWz1zDZW1M S5yQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z19si6990edr.403.2019.10.02.12.08.40; Wed, 02 Oct 2019 12:09:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729394AbfJBTIW (ORCPT + 99 others); Wed, 2 Oct 2019 15:08:22 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:35342 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729087AbfJBTIJ (ORCPT ); Wed, 2 Oct 2019 15:08:09 -0400 Received: from [192.168.4.242] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iFjyo-00035x-Ft; Wed, 02 Oct 2019 20:08:06 +0100 Received: from ben by deadeye with local (Exim 4.92.1) (envelope-from ) id 1iFjyn-0003c7-Qd; Wed, 02 Oct 2019 20:08:05 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, Denis Kirjanov , "David S. Miller" , "Kees Cook" Date: Wed, 02 Oct 2019 20:06:51 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 28/87] net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE() In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.242 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.75-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Kees Cook commit 3e66b7cc50ef921121babc91487e1fb98af1ba6e upstream. Building with Clang reports the redundant use of MODULE_DEVICE_TABLE(): drivers/net/ethernet/dec/tulip/de4x5.c:2110:1: error: redefinition of '__mod_eisa__de4x5_eisa_ids_device_table' MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); ^ ./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE' extern typeof(name) __mod_##type##__##name##_device_table \ ^ :90:1: note: expanded from here __mod_eisa__de4x5_eisa_ids_device_table ^ drivers/net/ethernet/dec/tulip/de4x5.c:2100:1: note: previous definition is here MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); ^ ./include/linux/module.h:229:21: note: expanded from macro 'MODULE_DEVICE_TABLE' extern typeof(name) __mod_##type##__##name##_device_table \ ^ :85:1: note: expanded from here __mod_eisa__de4x5_eisa_ids_device_table ^ This drops the one further from the table definition to match the common use of MODULE_DEVICE_TABLE(). Fixes: 07563c711fbc ("EISA bus MODALIAS attributes support") Signed-off-by: Kees Cook Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- drivers/net/ethernet/dec/tulip/de4x5.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c @@ -2107,7 +2107,6 @@ static struct eisa_driver de4x5_eisa_dri .remove = de4x5_eisa_remove, } }; -MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); #endif #ifdef CONFIG_PCI