From patchwork Fri May 5 19:46:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98683 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292766qge; Fri, 5 May 2017 12:48:31 -0700 (PDT) X-Received: by 10.98.86.207 with SMTP id h76mr3660602pfj.205.1494013711215; Fri, 05 May 2017 12:48:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.30; Fri, 05 May 2017 12:48:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754324AbdEETs3 (ORCPT + 6 others); Fri, 5 May 2017 15:48:29 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53915 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdEETsZ (ORCPT ); Fri, 5 May 2017 15:48:25 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LbUhX-1dnFou0PU3-00lIOc; Fri, 05 May 2017 21:48:03 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Andrew Morton , James Bottomley , Andrey Ryabinin , David Miller , Hans Verkuil , Linus Torvalds , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 06/87] MODULE_DEVICE_TABLE: fix some callsites Date: Fri, 5 May 2017 21:46:24 +0200 Message-Id: <20170505194745.3627137-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:uShPyOJB+xc586g2ldA5j0qR/Fyh6mfOwpSEUspfL6svhBj6mpp ThuTm/t9ZzhA1wP1Ko4RHK2dUQ4UUOgtX1FIGQXQ8waOW55tHPwWPR0PiudSTEHbPzsHvGt 0JbfWjj5BwI9WZP3MtJk4ZFxfB3WV9wlsvk/D9lGbLOlWpWvyYJTX3/NKd2OFfgoa+MTd7o 2tvJBZYs+Zzt09bR4yS+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:2ryop9g6pC4=:8LEcAbVo7IPQuLC5UFHTPZ BNt/xE6OkIcqyZwCADVfTmza7joYkhHzobrq8Hv7DYPAJwiH5wgcPydByI0JiHXharla0TVzD +2hAcYtswysbN+d6NDtgITX4c2RwyFsR+BX6OcvkEYLOsH5RRmkIx1fGmjdfaLxK/A/qKGWSM juyfZ5iLuTjjRAF/IawLRHGYuceUYdsM8K+hL6nVEZKtXfMeKoqKo5ROr3s9UD/ebEIpDv0t0 UEkcPcRfjR7IRRgCdE1i3/J9gDfU0lOwy85Qq9MYf2Y3+NpJVBcN8zF9xC+0oGZxHOaRdDvc/ EUnjfL7fwcJNSNTMiOvNnKJQ96CwT5sHR2G/2N+uRWYdNiQJbUXdYQo1KSkl5NyNOp4fo7hz4 fAILFPsvxbnr/2g5xGB5XsjtDmZ1XS0xe/LOem45Z5lk+8TIo/daUL7AIXUlrP1Jlp/GAwYIK CHKQ/Px8ip9WuTJL287WMR4TGAC/CvMFhIVZJYnp/cZQ4s/2bty0ba469CXsV5KmpsY3ok+oH I2YSCcpb6G+jxrLfAIdyFQ8sKN00B/Cf0nlB6VArOq235qpAeHIuDeXxKefKXCIcrmYaXN33o eOXsZwfpjUwv2fmqJswnEdiwEMlBZ7axjVaFol5UkzS+wXuLwtrr1oawBs1tCTP1LSxVWS1oT tObY2TU2T0AbuHPNB4zpi8SxFpUXFejfjtzbVcfs6K24g6q6hFnaMzhoJeFTAGf5VZT0= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrew Morton commit 0f989f749b51ec1fd94bb5a42f8ad10c8b9f73cb upstream. The patch "module: fix types of device tables aliases" newly requires that invocations of MODULE_DEVICE_TABLE(type, name); come *after* the definition of `name'. That is reasonable, but some drivers weren't doing this. Fix them. Cc: James Bottomley Cc: Andrey Ryabinin Cc: David Miller Cc: Hans Verkuil Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- Documentation/video4linux/v4l2-pci-skeleton.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 1 - drivers/scsi/be2iscsi/be_main.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) -- 2.9.0 diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/Documentation/video4linux/v4l2-pci-skeleton.c index 46904fe49609..8c3d3d625c6c 100644 --- a/Documentation/video4linux/v4l2-pci-skeleton.c +++ b/Documentation/video4linux/v4l2-pci-skeleton.c @@ -42,7 +42,6 @@ MODULE_DESCRIPTION("V4L2 PCI Skeleton Driver"); MODULE_AUTHOR("Hans Verkuil"); MODULE_LICENSE("GPL v2"); -MODULE_DEVICE_TABLE(pci, skeleton_pci_tbl); /** * struct skeleton - All internal data for one instance of device @@ -95,6 +94,7 @@ static const struct pci_device_id skeleton_pci_tbl[] = { /* { PCI_DEVICE(PCI_VENDOR_ID_, PCI_DEVICE_ID_) }, */ { 0, } }; +MODULE_DEVICE_TABLE(pci, skeleton_pci_tbl); /* * HDTV: this structure has the capabilities of the HDTV receiver. diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 1e187fb760f8..7329ab75afb5 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -26,7 +26,6 @@ #include MODULE_VERSION(DRV_VER); -MODULE_DEVICE_TABLE(pci, be_dev_ids); MODULE_DESCRIPTION(DRV_DESC " " DRV_VER); MODULE_AUTHOR("Emulex Corporation"); MODULE_LICENSE("GPL"); diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 803fd64d0966..1075b7001e4a 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -48,7 +48,6 @@ static unsigned int be_iopoll_budget = 10; static unsigned int be_max_phys_size = 64; static unsigned int enable_msix = 1; -MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table); MODULE_DESCRIPTION(DRV_DESC " " BUILD_STR); MODULE_VERSION(BUILD_STR); MODULE_AUTHOR("Emulex Corporation");