leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] lirc_zilog: Remove disable_tx module parameter

Browse Source 
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>
This commit is contained in:
Andy Walls 2011-01-12 23:31:25 -03:00 committed by Mauro Carvalho Chehab
parent 86e52428ee
commit 02fcaaa3a5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/lirc/lirc_zilog.c
View File

@ -131,7 +131,6 @@ static struct mutex tx_data_lock;
/* module parameters */ /* module parameters */
static int debug; /* debug output */ static int debug; /* debug output */
static int disable_rx; /* disable RX device */ static int disable_rx; /* disable RX device */
static int disable_tx; /* disable TX device */
static int minor = -1; /* minor number */ static int minor = -1; /* minor number */
#define dprintk(fmt, args...) \ #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; client->addr = 0x70;
if (!disable_tx) {
if (i2c_master_recv(client, &buf, 1) == 1) if (i2c_master_recv(client, &buf, 1) == 1)
have_tx = 1; have_tx = 1;
dprintk("probe 0x70 @ %s: %s\n", dprintk("probe 0x70 @ %s: %s\n",
adap->name, have_tx ? "success" : "failed"); adap->name, have_tx ? "success" : "failed");
}
if (!disable_rx) { if (!disable_rx) {
client->addr = 0x71; client->addr = 0x71;
@ -1398,6 +1395,3 @@ MODULE_PARM_DESC(debug, "Enable debugging messages");
module_param(disable_rx, bool, 0644); module_param(disable_rx, bool, 0644);
MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device"); 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");