From b56edc27d219632d0ff61b7a12e76970c4eea6c1 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 18 Oct 2012 23:12:50 +0800
Subject: [PATCH] --- yaml --- r: 337283 b: refs/heads/master c:
 01c071439730013cc110dd321852b44432cf496c h: refs/heads/master i:   337281:
 7079cad3625073cd43cd8362668efe4c4131b655   337279:
 0bc01feace0e9986c848f6c65f209abd8dc26c23 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/vme/bridges/vme_tsi148.c | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 41584bed540e..fb50f9025cc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7b50a2a29451f9a6ec6bc7fd4c8ad836297ffc4
+refs/heads/master: 01c071439730013cc110dd321852b44432cf496c
diff --git a/trunk/drivers/vme/bridges/vme_tsi148.c b/trunk/drivers/vme/bridges/vme_tsi148.c
index 5fbd08ffb9c2..9c1aa4dc39c9 100644
--- a/trunk/drivers/vme/bridges/vme_tsi148.c
+++ b/trunk/drivers/vme/bridges/vme_tsi148.c
@@ -35,10 +35,8 @@
 #include "../vme_bridge.h"
 #include "vme_tsi148.h"
 
-static int __init tsi148_init(void);
 static int tsi148_probe(struct pci_dev *, const struct pci_device_id *);
 static void tsi148_remove(struct pci_dev *);
-static void __exit tsi148_exit(void);
 
 
 /* Module parameter */
@@ -2244,11 +2242,6 @@ static void tsi148_free_consistent(struct device *parent, size_t size,
 	pci_free_consistent(pdev, size, vaddr, dma);
 }
 
-static int __init tsi148_init(void)
-{
-	return pci_register_driver(&tsi148_driver);
-}
-
 /*
  * Configure CR/CSR space
  *
@@ -2754,10 +2747,7 @@ static void tsi148_remove(struct pci_dev *pdev)
 	kfree(tsi148_bridge);
 }
 
-static void __exit tsi148_exit(void)
-{
-	pci_unregister_driver(&tsi148_driver);
-}
+module_pci_driver(tsi148_driver);
 
 MODULE_PARM_DESC(err_chk, "Check for VME errors on reads and writes");
 module_param(err_chk, bool, 0);
@@ -2767,6 +2757,3 @@ module_param(geoid, int, 0);
 
 MODULE_DESCRIPTION("VME driver for the Tundra Tempe VME bridge");
 MODULE_LICENSE("GPL");
-
-module_init(tsi148_init);
-module_exit(tsi148_exit);