aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Walls <awalls@md.metrocast.net>2011-01-13 02:31:25 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-17 13:27:33 (GMT)
commita39b0ee730016f60df92ba03c8fff89b42d0ba17 (patch)
treebd454a6d32bef9935049c46634d5cf6c6cbf5023
parent825fff8b2775bc98a5de48af74476ad6f263b4b3 (diff)
[media] lirc_zilog: Remove disable_tx module parameter
The only reason to use the lirc_zilog module is for IR Tx, so remove the possibility of disabling IR Tx. If the user needs only IR Rx, then the ir-kbd-i2c module works just fine, and doesn't require a "firmware" image. Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/lirc/lirc_zilog.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index bf81e3f..9112533 100644
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -131,7 +131,6 @@ static struct mutex tx_data_lock;
/* module parameters */
static int debug; /* debug output */
static int disable_rx; /* disable RX device */
-static int disable_tx; /* disable TX device */
static int minor = -1; /* minor number */
#define dprintk(fmt, args...) \
@@ -1218,12 +1217,10 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
*/
client->addr = 0x70;
- if (!disable_tx) {
- if (i2c_master_recv(client, &buf, 1) == 1)
- have_tx = 1;
- dprintk("probe 0x70 @ %s: %s\n",
- adap->name, have_tx ? "success" : "failed");
- }
+ if (i2c_master_recv(client, &buf, 1) == 1)
+ have_tx = 1;
+ dprintk("probe 0x70 @ %s: %s\n",
+ adap->name, have_tx ? "success" : "failed");
if (!disable_rx) {
client->addr = 0x71;
@@ -1398,6 +1395,3 @@ MODULE_PARM_DESC(debug, "Enable debugging messages");
module_param(disable_rx, bool, 0644);
MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
-
-module_param(disable_tx, bool, 0644);
-MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");

Privacy Policy