From d2ce81228202e0aaeff4441372aab8a656267723 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 18 Dec 2012 16:40:16 +0100
Subject: [PATCH] --- yaml --- r: 351909 b: refs/heads/master c:
 234d4d6b1038f004f233f14906ec9328bf53088b h: refs/heads/master i:   351907:
 098018a7e8f57e035b4a6937b6f405d410085405 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/nfc/pn544/i2c.c | 24 +-----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index ee950dff1d63..ac078f7f8b64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa74103071312fede1f4953fe3c027941add1256
+refs/heads/master: 234d4d6b1038f004f233f14906ec9328bf53088b
diff --git a/trunk/drivers/nfc/pn544/i2c.c b/trunk/drivers/nfc/pn544/i2c.c
index 7da9071b68b6..ec79f355edc1 100644
--- a/trunk/drivers/nfc/pn544/i2c.c
+++ b/trunk/drivers/nfc/pn544/i2c.c
@@ -472,29 +472,7 @@ static struct i2c_driver pn544_hci_i2c_driver = {
 	.remove = __devexit_p(pn544_hci_i2c_remove),
 };
 
-static int __init pn544_hci_i2c_init(void)
-{
-	int r;
-
-	pr_debug(DRIVER_DESC ": %s\n", __func__);
-
-	r = i2c_add_driver(&pn544_hci_i2c_driver);
-	if (r) {
-		pr_err(PN544_HCI_I2C_DRIVER_NAME
-		       ": driver registration failed\n");
-		return r;
-	}
-
-	return 0;
-}
-
-static void __exit pn544_hci_i2c_exit(void)
-{
-	i2c_del_driver(&pn544_hci_i2c_driver);
-}
-
-module_init(pn544_hci_i2c_init);
-module_exit(pn544_hci_i2c_exit);
+module_i2c_driver(pn544_hci_i2c_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION(DRIVER_DESC);