[Devel] [PATCH RHEL7 COMMIT] ms/MODULE_DEVICE_TABLE: fix some callsites

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-229.7.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.6.6
------>
commit c2814d62886ad2b1697f7a4152d545662bdb2351
Author: Andrey Ryabinin <aryabinin at odin.com>
Date:   Thu Sep 3 19:27:34 2015 +0400

    ms/MODULE_DEVICE_TABLE: fix some callsites
    
    https://jira.sw.ru/browse/PSBM-26429
    
    From: Andrew Morton <akpm at linux-foundation.org>
    
    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 <James.Bottomley at HansenPartnership.com>
    Cc: Andrey Ryabinin <a.ryabinin at samsung.com>
    Cc: David Miller <davem at davemloft.net>
    Cc: Hans Verkuil <hverkuil at xs4all.nl>
    Acked-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    Signed-off-by: Andrey Ryabinin <aryabinin at odin.com>
    
    Signed-off-by: Andrey Ryabinin <aryabinin at odin.com>
---
 drivers/net/ethernet/emulex/benet/be_main.c | 1 -
 drivers/scsi/be2iscsi/be_main.c             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 167fe08..4e60ee7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -26,7 +26,6 @@
 #include <net/vxlan.h>
 
 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 6b079d6..f9506b2 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");