AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-02 09:46:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] lirc_zilog: remove module parameter minor

Browse Source 
Always let the kernel decide what minor the lirc chardev gets.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
David Härdeman 2017-05-01 13:04:16 -03:00 committed by Mauro Carvalho Chehab
parent 56481f0060
commit bd16168da8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/media/lirc/lirc_zilog.c
View File

@ -156,7 +156,6 @@ static struct mutex tx_data_lock;
/* module parameters */ /* module parameters */
static bool debug; /* debug output */ static bool debug; /* debug output */
static bool tx_only; /* only handle the IR Tx function */ static bool tx_only; /* only handle the IR Tx function */
static int minor = -1; /* minor number */
/* struct IR reference counting */ /* struct IR reference counting */
@ -184,10 +183,11 @@ static void release_ir_device(struct kref *ref)
* ir->open_count == 0 - happens on final close() * ir->open_count == 0 - happens on final close()
* ir_lock, tx_ref_lock, rx_ref_lock, all released * ir_lock, tx_ref_lock, rx_ref_lock, all released
*/ */
if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) { if (ir->l.minor >= 0) {
lirc_unregister_driver(ir->l.minor); lirc_unregister_driver(ir->l.minor);
ir->l.minor = MAX_IRCTL_DEVICES; ir->l.minor = -1;
} }
if (kfifo_initialized(&ir->rbuf.fifo)) if (kfifo_initialized(&ir->rbuf.fifo))
lirc_buffer_free(&ir->rbuf); lirc_buffer_free(&ir->rbuf);
list_del(&ir->list); list_del(&ir->list);
@ -1597,12 +1597,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
} }
/* register with lirc */ /* register with lirc */
ir->l.minor = minor; /* module option: user requested minor number */
ir->l.minor = lirc_register_driver(&ir->l); ir->l.minor = lirc_register_driver(&ir->l);
if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) { if (ir->l.minor < 0) {
dev_err(tx->ir->l.dev, dev_err(tx->ir->l.dev,
"%s: \"minor\" must be between 0 and %d (%d)!\n", "%s: lirc_register_driver() failed: %i\n",
__func__, MAX_IRCTL_DEVICES-1, ir->l.minor); __func__, ir->l.minor);
ret = -EBADRQC; ret = -EBADRQC;
goto out_put_xx; goto out_put_xx;
} }
@ -1674,9 +1673,6 @@ MODULE_LICENSE("GPL");
/* for compat with old name, which isn't all that accurate anymore */ /* for compat with old name, which isn't all that accurate anymore */
MODULE_ALIAS("lirc_pvr150"); MODULE_ALIAS("lirc_pvr150");
module_param(minor, int, 0444);
MODULE_PARM_DESC(minor, "Preferred minor device number");
module_param(debug, bool, 0644); module_param(debug, bool, 0644);
MODULE_PARM_DESC(debug, "Enable debugging messages"); MODULE_PARM_DESC(debug, "Enable debugging messages");