aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/ati_remote.c33
-rw-r--r--drivers/media/rc/ene_ir.c2
-rw-r--r--drivers/media/rc/ene_ir.h2
-rw-r--r--drivers/media/rc/imon.c21
-rw-r--r--drivers/media/rc/lirc_dev.c2
-rw-r--r--drivers/media/rc/mceusb.c24
-rw-r--r--drivers/media/rc/rc-main.c2
-rw-r--r--drivers/media/rc/redrat3.c20
-rw-r--r--drivers/media/rc/streamzap.c32
-rw-r--r--drivers/media/rc/winbond-cir.c6
10 files changed, 16 insertions, 128 deletions
diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 01bb8daf4b09..baf907b3ce76 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -899,38 +899,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)
899 kfree(ati_remote); 899 kfree(ati_remote);
900} 900}
901 901
902/* 902module_usb_driver(ati_remote_driver);
903 * ati_remote_init
904 */
905static int __init ati_remote_init(void)
906{
907 int result;
908
909 result = usb_register(&ati_remote_driver);
910 if (result)
911 printk(KERN_ERR KBUILD_MODNAME
912 ": usb_register error #%d\n", result);
913 else
914 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
915 DRIVER_DESC "\n");
916
917 return result;
918}
919
920/*
921 * ati_remote_exit
922 */
923static void __exit ati_remote_exit(void)
924{
925 usb_deregister(&ati_remote_driver);
926}
927
928/*
929 * module specification
930 */
931
932module_init(ati_remote_init);
933module_exit(ati_remote_exit);
934 903
935MODULE_AUTHOR(DRIVER_AUTHOR); 904MODULE_AUTHOR(DRIVER_AUTHOR);
936MODULE_DESCRIPTION(DRIVER_DESC); 905MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index cf10ecf5acec..860c112e0fd2 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -324,7 +324,7 @@ static int ene_rx_get_sample_reg(struct ene_device *dev)
324 return dev->extra_buf2_address + r_pointer; 324 return dev->extra_buf2_address + r_pointer;
325 } 325 }
326 326
327 dbg("attempt to read beyong ring bufer end"); 327 dbg("attempt to read beyond ring buffer end");
328 return 0; 328 return 0;
329} 329}
330 330
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h
index fd108d90f750..6f978e85db8c 100644
--- a/drivers/media/rc/ene_ir.h
+++ b/drivers/media/rc/ene_ir.h
@@ -227,7 +227,7 @@ struct ene_device {
227 227
228 /* TX buffer */ 228 /* TX buffer */
229 unsigned *tx_buffer; /* input samples buffer*/ 229 unsigned *tx_buffer; /* input samples buffer*/
230 int tx_pos; /* position in that bufer */ 230 int tx_pos; /* position in that buffer */
231 int tx_len; /* current len of tx buffer */ 231 int tx_len; /* current len of tx buffer */
232 int tx_done; /* done transmitting */ 232 int tx_done; /* done transmitting */
233 /* one more sample pending*/ 233 /* one more sample pending*/
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 3f175ebe2766..7f26fdf2e54e 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2476,23 +2476,4 @@ static int imon_resume(struct usb_interface *intf)
2476 return rc; 2476 return rc;
2477} 2477}
2478 2478
2479static int __init imon_init(void) 2479module_usb_driver(imon_driver);
2480{
2481 int rc;
2482
2483 rc = usb_register(&imon_driver);
2484 if (rc) {
2485 pr_err("usb register failed(%d)\n", rc);
2486 rc = -ENODEV;
2487 }
2488
2489 return rc;
2490}
2491
2492static void __exit imon_exit(void)
2493{
2494 usb_deregister(&imon_driver);
2495}
2496
2497module_init(imon_init);
2498module_exit(imon_exit);
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 27997a9ceb0d..ca12d3289bfe 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -38,7 +38,7 @@
38#include <media/lirc.h> 38#include <media/lirc.h>
39#include <media/lirc_dev.h> 39#include <media/lirc_dev.h>
40 40
41static int debug; 41static bool debug;
42 42
43#define IRCTL_DEV_NAME "BaseRemoteCtl" 43#define IRCTL_DEV_NAME "BaseRemoteCtl"
44#define NOPLUG -1 44#define NOPLUG -1
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 60d3c1e09712..21105bf9594d 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -156,9 +156,9 @@
156 156
157/* module parameters */ 157/* module parameters */
158#ifdef CONFIG_USB_DEBUG 158#ifdef CONFIG_USB_DEBUG
159static int debug = 1; 159static bool debug = 1;
160#else 160#else
161static int debug; 161static bool debug;
162#endif 162#endif
163 163
164#define mce_dbg(dev, fmt, ...) \ 164#define mce_dbg(dev, fmt, ...) \
@@ -1448,25 +1448,7 @@ static struct usb_driver mceusb_dev_driver = {
1448 .id_table = mceusb_dev_table 1448 .id_table = mceusb_dev_table
1449}; 1449};
1450 1450
1451static int __init mceusb_dev_init(void) 1451module_usb_driver(mceusb_dev_driver);
1452{
1453 int ret;
1454
1455 ret = usb_register(&mceusb_dev_driver);
1456 if (ret < 0)
1457 printk(KERN_ERR DRIVER_NAME
1458 ": usb register failed, result = %d\n", ret);
1459
1460 return ret;
1461}
1462
1463static void __exit mceusb_dev_exit(void)
1464{
1465 usb_deregister(&mceusb_dev_driver);
1466}
1467
1468module_init(mceusb_dev_init);
1469module_exit(mceusb_dev_exit);
1470 1452
1471MODULE_DESCRIPTION(DRIVER_DESC); 1453MODULE_DESCRIPTION(DRIVER_DESC);
1472MODULE_AUTHOR(DRIVER_AUTHOR); 1454MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 0ea55ea2b71d..f6a930b70c69 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -715,7 +715,7 @@ static void ir_close(struct input_dev *idev)
715} 715}
716 716
717/* class for /sys/class/rc */ 717/* class for /sys/class/rc */
718static char *ir_devnode(struct device *dev, mode_t *mode) 718static char *ir_devnode(struct device *dev, umode_t *mode)
719{ 719{
720 return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev)); 720 return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev));
721} 721}
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 9bff23cb0a5b..ad95c67a4dba 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -1284,25 +1284,7 @@ static struct usb_driver redrat3_dev_driver = {
1284 .id_table = redrat3_dev_table 1284 .id_table = redrat3_dev_table
1285}; 1285};
1286 1286
1287static int __init redrat3_dev_init(void) 1287module_usb_driver(redrat3_dev_driver);
1288{
1289 int ret;
1290
1291 ret = usb_register(&redrat3_dev_driver);
1292 if (ret < 0)
1293 pr_err(DRIVER_NAME
1294 ": usb register failed, result = %d\n", ret);
1295
1296 return ret;
1297}
1298
1299static void __exit redrat3_dev_exit(void)
1300{
1301 usb_deregister(&redrat3_dev_driver);
1302}
1303
1304module_init(redrat3_dev_init);
1305module_exit(redrat3_dev_exit);
1306 1288
1307MODULE_DESCRIPTION(DRIVER_DESC); 1289MODULE_DESCRIPTION(DRIVER_DESC);
1308MODULE_AUTHOR(DRIVER_AUTHOR); 1290MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index e435d94c0776..d6f4bfe09391 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -43,9 +43,9 @@
43#define DRIVER_DESC "Streamzap Remote Control driver" 43#define DRIVER_DESC "Streamzap Remote Control driver"
44 44
45#ifdef CONFIG_USB_DEBUG 45#ifdef CONFIG_USB_DEBUG
46static int debug = 1; 46static bool debug = 1;
47#else 47#else
48static int debug; 48static bool debug;
49#endif 49#endif
50 50
51#define USB_STREAMZAP_VENDOR_ID 0x0e9c 51#define USB_STREAMZAP_VENDOR_ID 0x0e9c
@@ -523,33 +523,7 @@ static int streamzap_resume(struct usb_interface *intf)
523 return 0; 523 return 0;
524} 524}
525 525
526/** 526module_usb_driver(streamzap_driver);
527 * streamzap_init
528 */
529static int __init streamzap_init(void)
530{
531 int ret;
532
533 /* register this driver with the USB subsystem */
534 ret = usb_register(&streamzap_driver);
535 if (ret < 0)
536 printk(KERN_ERR DRIVER_NAME ": usb register failed, "
537 "result = %d\n", ret);
538
539 return ret;
540}
541
542/**
543 * streamzap_exit
544 */
545static void __exit streamzap_exit(void)
546{
547 usb_deregister(&streamzap_driver);
548}
549
550
551module_init(streamzap_init);
552module_exit(streamzap_exit);
553 527
554MODULE_AUTHOR("Jarod Wilson <jarod@wilsonet.com>"); 528MODULE_AUTHOR("Jarod Wilson <jarod@wilsonet.com>");
555MODULE_DESCRIPTION(DRIVER_DESC); 529MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 13f54b51194a..b09c5fae489b 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -226,11 +226,11 @@ module_param(protocol, uint, 0444);
226MODULE_PARM_DESC(protocol, "IR protocol to use for the power-on command " 226MODULE_PARM_DESC(protocol, "IR protocol to use for the power-on command "
227 "(0 = RC5, 1 = NEC, 2 = RC6A, default)"); 227 "(0 = RC5, 1 = NEC, 2 = RC6A, default)");
228 228
229static int invert; /* default = 0 */ 229static bool invert; /* default = 0 */
230module_param(invert, bool, 0444); 230module_param(invert, bool, 0444);
231MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver"); 231MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver");
232 232
233static int txandrx; /* default = 0 */ 233static bool txandrx; /* default = 0 */
234module_param(txandrx, bool, 0444); 234module_param(txandrx, bool, 0444);
235MODULE_PARM_DESC(invert, "Allow simultaneous TX and RX"); 235MODULE_PARM_DESC(invert, "Allow simultaneous TX and RX");
236 236
@@ -1176,6 +1176,6 @@ wbcir_exit(void)
1176module_init(wbcir_init); 1176module_init(wbcir_init);
1177module_exit(wbcir_exit); 1177module_exit(wbcir_exit);
1178 1178
1179MODULE_AUTHOR("David Härdeman <david@hardeman.nu>"); 1179MODULE_AUTHOR("David Härdeman <david@hardeman.nu>");
1180MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver"); 1180MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver");
1181MODULE_LICENSE("GPL"); 1181MODULE_LICENSE("GPL");