diff options
author | Andy Walls <awalls@md.metrocast.net> | 2011-01-12 21:31:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-19 08:46:03 -0500 |
commit | 02fcaaa3a52b2bdad8a08a3ee5747f27f27df27d (patch) | |
tree | e46bde7ccc91d901347f2f4a1fe64f270278b9f6 /drivers | |
parent | 86e52428eed0507a11ba03c5de731c763bd88480 (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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/lirc/lirc_zilog.c | 14 |
1 files changed, 4 insertions, 10 deletions
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; | |||
131 | /* module parameters */ | 131 | /* module parameters */ |
132 | static int debug; /* debug output */ | 132 | static int debug; /* debug output */ |
133 | static int disable_rx; /* disable RX device */ | 133 | static int disable_rx; /* disable RX device */ |
134 | static int disable_tx; /* disable TX device */ | ||
135 | static int minor = -1; /* minor number */ | 134 | static int minor = -1; /* minor number */ |
136 | 135 | ||
137 | #define dprintk(fmt, args...) \ | 136 | #define dprintk(fmt, args...) \ |
@@ -1218,12 +1217,10 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
1218 | */ | 1217 | */ |
1219 | client->addr = 0x70; | 1218 | client->addr = 0x70; |
1220 | 1219 | ||
1221 | if (!disable_tx) { | 1220 | if (i2c_master_recv(client, &buf, 1) == 1) |
1222 | if (i2c_master_recv(client, &buf, 1) == 1) | 1221 | have_tx = 1; |
1223 | have_tx = 1; | 1222 | dprintk("probe 0x70 @ %s: %s\n", |
1224 | dprintk("probe 0x70 @ %s: %s\n", | 1223 | adap->name, have_tx ? "success" : "failed"); |
1225 | adap->name, have_tx ? "success" : "failed"); | ||
1226 | } | ||
1227 | 1224 | ||
1228 | if (!disable_rx) { | 1225 | if (!disable_rx) { |
1229 | client->addr = 0x71; | 1226 | client->addr = 0x71; |
@@ -1398,6 +1395,3 @@ MODULE_PARM_DESC(debug, "Enable debugging messages"); | |||
1398 | 1395 | ||
1399 | module_param(disable_rx, bool, 0644); | 1396 | module_param(disable_rx, bool, 0644); |
1400 | MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device"); | 1397 | MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device"); |
1401 | |||
1402 | module_param(disable_tx, bool, 0644); | ||
1403 | MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device"); | ||