From 7ae37893c55c712cb419f48b6952c0a364a9b45e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Apr 2012 14:33:06 -0700
Subject: [PATCH] --- yaml --- r: 303609 b: refs/heads/master c:
 9451df0ee893dbdfca626f2888654f321d241460 h: refs/heads/master i:   303607:
 1ec1ffc48c5890c35757f15712047836cbd11862 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/media/as102/as102_drv.c | 34 +------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index 7fe083a89580..93b62726938f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fee5952fba478a395798c99531dc095e440a6ef0
+refs/heads/master: 9451df0ee893dbdfca626f2888654f321d241460
diff --git a/trunk/drivers/staging/media/as102/as102_drv.c b/trunk/drivers/staging/media/as102/as102_drv.c
index ea4f992de235..ac92eaf6c74b 100644
--- a/trunk/drivers/staging/media/as102/as102_drv.c
+++ b/trunk/drivers/staging/media/as102/as102_drv.c
@@ -279,40 +279,8 @@ void as102_dvb_unregister(struct as102_dev_t *as102_dev)
 	pr_info("Unregistered device %s", as102_dev->name);
 }
 
-static int __init as102_driver_init(void)
-{
-	int ret;
-
-	/* register this driver with the low level subsystem */
-	ret = usb_register(&as102_usb_driver);
-	if (ret)
-		err("usb_register failed (ret = %d)", ret);
-
-	return ret;
-}
-
-/*
- * Mandatory function : Adds a special section to the module indicating
- * where initialisation function is defined
- */
-module_init(as102_driver_init);
-
-/**
- * as102_driver_exit - as102 driver exit point
- *
- * This function is called when device has to be removed.
- */
-static void __exit as102_driver_exit(void)
-{
-	/* deregister this driver with the low level bus subsystem */
-	usb_deregister(&as102_usb_driver);
-}
+module_usb_driver(as102_usb_driver);
 
-/*
- * required function for unload: Adds a special section to the module
- * indicating where unload function is defined
- */
-module_exit(as102_driver_exit);
 /* modinfo details */
 MODULE_DESCRIPTION(DRIVER_FULL_NAME);
 MODULE_LICENSE("GPL");