From b920d06aae5d8e7b07c520266236fe78ed9ff125 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Wed, 4 Apr 2012 22:29:32 +0800
Subject: [PATCH] --- yaml --- r: 307641 b: refs/heads/master c:
 8ebb35fd7ad07ab9a88a35eedd4f89a1e2a8fa55 h: refs/heads/master i:   307639:
 2bf8269ae49f6df3e323e4b7d8818b2dcfd98daa v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/spi/spi-dw-pci.c     | 13 +------------
 trunk/drivers/spi/spi-pxa2xx-pci.c | 12 +-----------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index df4032d6cf61..e43c1ecd7b64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39f8052d2e0c35533e776ef1235e4cc32cc35d02
+refs/heads/master: 8ebb35fd7ad07ab9a88a35eedd4f89a1e2a8fa55
diff --git a/trunk/drivers/spi/spi-dw-pci.c b/trunk/drivers/spi/spi-dw-pci.c
index 14f7cc9523f0..ff81abbb3066 100644
--- a/trunk/drivers/spi/spi-dw-pci.c
+++ b/trunk/drivers/spi/spi-dw-pci.c
@@ -164,18 +164,7 @@ static struct pci_driver dw_spi_driver = {
 	.resume	=	spi_resume,
 };
 
-static int __init mrst_spi_init(void)
-{
-	return pci_register_driver(&dw_spi_driver);
-}
-
-static void __exit mrst_spi_exit(void)
-{
-	pci_unregister_driver(&dw_spi_driver);
-}
-
-module_init(mrst_spi_init);
-module_exit(mrst_spi_exit);
+module_pci_driver(dw_spi_driver);
 
 MODULE_AUTHOR("Feng Tang <feng.tang@intel.com>");
 MODULE_DESCRIPTION("PCI interface driver for DW SPI Core");
diff --git a/trunk/drivers/spi/spi-pxa2xx-pci.c b/trunk/drivers/spi/spi-pxa2xx-pci.c
index 3fb44afe27b4..9f6ba34b172c 100644
--- a/trunk/drivers/spi/spi-pxa2xx-pci.c
+++ b/trunk/drivers/spi/spi-pxa2xx-pci.c
@@ -164,17 +164,7 @@ static struct pci_driver ce4100_spi_driver = {
 	.remove         = __devexit_p(ce4100_spi_remove),
 };
 
-static int __init ce4100_spi_init(void)
-{
-	return pci_register_driver(&ce4100_spi_driver);
-}
-module_init(ce4100_spi_init);
-
-static void __exit ce4100_spi_exit(void)
-{
-	pci_unregister_driver(&ce4100_spi_driver);
-}
-module_exit(ce4100_spi_exit);
+module_pci_driver(ce4100_spi_driver);
 
 MODULE_DESCRIPTION("CE4100 PCI-SPI glue code for PXA's driver");
 MODULE_LICENSE("GPL v2");