Merge ath-next from ath.git

[karo-tx-linux.git] / drivers / media / rc / ite-cir.c

diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 447fe35862dc2d5ad00cce91eb7fd61edaf9e4b5..0f301903aa6ffd43209c2b03854c2c8bef87d368 100644 (file)
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1666,7 +1666,6 @@ static int ite_suspend(struct pnp_dev *pdev, pm_message_t state)
 
 static int ite_resume(struct pnp_dev *pdev)
 {
-       int ret = 0;
        struct ite_dev *dev = pnp_get_drvdata(pdev);
        unsigned long flags;
 
@@ -1681,7 +1680,7 @@ static int ite_resume(struct pnp_dev *pdev)
 
        spin_unlock_irqrestore(&dev->lock, flags);
 
-       return ret;
+       return 0;
 }
 
 static void ite_shutdown(struct pnp_dev *pdev)
@@ -1709,21 +1708,10 @@ static struct pnp_driver ite_driver = {
        .shutdown       = ite_shutdown,
 };
 
-static int __init ite_init(void)
-{
-       return pnp_register_driver(&ite_driver);
-}
-
-static void __exit ite_exit(void)
-{
-       pnp_unregister_driver(&ite_driver);
-}
-
 MODULE_DEVICE_TABLE(pnp, ite_ids);
 MODULE_DESCRIPTION("ITE Tech Inc. IT8712F/ITE8512F CIR driver");
 
 MODULE_AUTHOR("Juan J. Garcia de Soria <skandalfo@gmail.com>");
 MODULE_LICENSE("GPL");
 
-module_init(ite_init);
-module_exit(ite_exit);
+module_pnp_driver(ite_driver);