From 02fcaaa3a52b2bdad8a08a3ee5747f27f27df27d Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@md.metrocast.net>
Date: Wed, 12 Jan 2011 23:31:25 -0300
Subject: [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>
---
 drivers/staging/lirc/lirc_zilog.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'drivers')

diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index bf81e3fddf80..91125336144e 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");
-- 
cgit v1.2.3