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

[media] imon: remove redundant change_protocol call

Browse Source 
There was a redundant call to imon_ir_change_protocol -- its already
getting called from ir_input_register. Also do some minor housekeeping
with var names and formatting.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jarod Wilson 2010-10-23 16:42:51 -03:00 committed by Mauro Carvalho Chehab
parent 428cc7633d
commit 6aa209e41f
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/IR/imon.c
View File

@ -315,7 +315,7 @@ MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
static bool debug; static bool debug;
module_param(debug, bool, S_IRUGO | S_IWUSR); module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes (default: no)");
/* lcd, vfd, vga or none? should be auto-detected, but can be overridden... */ /* lcd, vfd, vga or none? should be auto-detected, but can be overridden... */
static int display_type; static int display_type;
@ -784,7 +784,7 @@ static struct attribute *imon_display_sysfs_entries[] = {
NULL NULL
}; };
static struct attribute_group imon_display_attribute_group = { static struct attribute_group imon_display_attr_group = {
.attrs = imon_display_sysfs_entries .attrs = imon_display_sysfs_entries
}; };
@ -793,7 +793,7 @@ static struct attribute *imon_rf_sysfs_entries[] = {
NULL NULL
}; };
static struct attribute_group imon_rf_attribute_group = { static struct attribute_group imon_rf_attr_group = {
.attrs = imon_rf_sysfs_entries .attrs = imon_rf_sysfs_entries
}; };
@ -2238,8 +2238,7 @@ static void imon_init_display(struct imon_context *ictx,
dev_dbg(ictx->dev, "Registering iMON display with sysfs\n"); dev_dbg(ictx->dev, "Registering iMON display with sysfs\n");
/* set up sysfs entry for built-in clock */ /* set up sysfs entry for built-in clock */
ret = sysfs_create_group(&intf->dev.kobj, ret = sysfs_create_group(&intf->dev.kobj, &imon_display_attr_group);
&imon_display_attribute_group);
if (ret) if (ret)
dev_err(ictx->dev, "Could not create display sysfs " dev_err(ictx->dev, "Could not create display sysfs "
"entries(%d)", ret); "entries(%d)", ret);
@ -2312,7 +2311,7 @@ static int __devinit imon_probe(struct usb_interface *interface,
if (ifnum == 0) { if (ifnum == 0) {
if (product == 0xffdc && ictx->rf_device) { if (product == 0xffdc && ictx->rf_device) {
sysfs_err = sysfs_create_group(&interface->dev.kobj, sysfs_err = sysfs_create_group(&interface->dev.kobj,
&imon_rf_attribute_group); &imon_rf_attr_group);
if (sysfs_err) if (sysfs_err)
pr_err("Could not create RF sysfs entries(%d)\n", pr_err("Could not create RF sysfs entries(%d)\n",
sysfs_err); sysfs_err);
@ -2322,14 +2321,6 @@ static int __devinit imon_probe(struct usb_interface *interface,
imon_init_display(ictx, interface); imon_init_display(ictx, interface);
} }
/* set IR protocol/remote type */
ret = imon_ir_change_protocol(ictx, ictx->ir_type);
if (ret) {
dev_warn(dev, "%s: failed to set IR protocol, falling back "
"to standard iMON protocol mode\n", __func__);
ictx->ir_type = IR_TYPE_OTHER;
}
dev_info(dev, "iMON device (%04x:%04x, intf%d) on " dev_info(dev, "iMON device (%04x:%04x, intf%d) on "
"usb<%d:%d> initialized\n", vendor, product, ifnum, "usb<%d:%d> initialized\n", vendor, product, ifnum,
usbdev->bus->busnum, usbdev->devnum); usbdev->bus->busnum, usbdev->devnum);
@ -2368,10 +2359,8 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
* sysfs_remove_group is safe to call even if sysfs_create_group * sysfs_remove_group is safe to call even if sysfs_create_group
* hasn't been called * hasn't been called
*/ */
sysfs_remove_group(&interface->dev.kobj, sysfs_remove_group(&interface->dev.kobj, &imon_display_attr_group);
&imon_display_attribute_group); sysfs_remove_group(&interface->dev.kobj, &imon_rf_attr_group);
sysfs_remove_group(&interface->dev.kobj,
&imon_rf_attribute_group);
usb_set_intfdata(interface, NULL); usb_set_intfdata(interface, NULL);