Skip to content

Commit 518f4b2

Browse files
seanyoungmchehab
seanyoung
authored and
mchehab
committed
media: rc-core: rename input_name to device_name
When an ir-spi is registered, you get this message. rc rc0: Unspecified device as /devices/platform/soc/3f215080.spi/spi_master/spi32766/spi32766.128/rc/rc0 "Unspecified device" refers to input_name, which makes no sense for IR TX only devices. So, rename to device_name. Also make driver_name const char* so that no casts are needed anywhere. Now ir-spi reports: rc rc0: IR SPI as /devices/platform/soc/3f215080.spi/spi_master/spi32766/spi32766.128/rc/rc0 Signed-off-by: Sean Young <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent db68102 commit 518f4b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+62
-62
lines changed

‎drivers/hid/hid-picolcd_cir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report)
116116
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
117117
rdev->open = picolcd_cir_open;
118118
rdev->close = picolcd_cir_close;
119-
rdev->input_name = data->hdev->name;
119+
rdev->device_name = data->hdev->name;
120120
rdev->input_phys = data->hdev->phys;
121121
rdev->input_id.bustype = data->hdev->bus;
122122
rdev->input_id.vendor = data->hdev->vendor;

‎drivers/media/cec/cec-core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,12 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
263263
return ERR_PTR(-ENOMEM);
264264
}
265265

266-
snprintf(adap->input_name, sizeof(adap->input_name),
266+
snprintf(adap->device_name, sizeof(adap->device_name),
267267
"RC for %s", name);
268268
snprintf(adap->input_phys, sizeof(adap->input_phys),
269269
"%s/input0", name);
270270

271-
adap->rc->input_name = adap->input_name;
271+
adap->rc->device_name = adap->device_name;
272272
adap->rc->input_phys = adap->input_phys;
273273
adap->rc->input_id.bustype = BUS_CEC;
274274
adap->rc->input_id.vendor = 0;

‎drivers/media/common/siano/smsir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
7373
strlcpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys));
7474
strlcat(coredev->ir.phys, "/ir0", sizeof(coredev->ir.phys));
7575

76-
dev->input_name = coredev->ir.name;
76+
dev->device_name = coredev->ir.name;
7777
dev->input_phys = coredev->ir.phys;
7878
dev->dev.parent = coredev->device;
7979

@@ -91,7 +91,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
9191
dev->driver_name = MODULE_NAME;
9292

9393
pr_debug("Input device (IR) %s is set for key events\n",
94-
dev->input_name);
94+
dev->device_name);
9595

9696
err = rc_register_device(dev);
9797
if (err < 0) {

‎drivers/media/i2c/ir-kbd-i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
452452
*/
453453
rc->input_id.bustype = BUS_I2C;
454454
rc->input_phys = ir->phys;
455-
rc->input_name = ir->name;
455+
rc->device_name = ir->name;
456456

457457
/*
458458
* Initialize the other fields of rc_dev

‎drivers/media/pci/bt8xx/bttv-input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ int bttv_input_init(struct bttv *btv)
535535
snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
536536
pci_name(btv->c.pci));
537537

538-
rc->input_name = ir->name;
538+
rc->device_name = ir->name;
539539
rc->input_phys = ir->phys;
540540
rc->input_id.bustype = BUS_PCI;
541541
rc->input_id.version = 1;

‎drivers/media/pci/cx23885/cx23885-input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
351351
}
352352

353353
kernel_ir->rc = rc;
354-
rc->input_name = kernel_ir->name;
354+
rc->device_name = kernel_ir->name;
355355
rc->input_phys = kernel_ir->phys;
356356
rc->input_id.bustype = BUS_PCI;
357357
rc->input_id.version = 1;

‎drivers/media/pci/cx88/cx88-input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
464464
snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
465465
snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
466466

467-
dev->input_name = ir->name;
467+
dev->device_name = ir->name;
468468
dev->input_phys = ir->phys;
469469
dev->input_id.bustype = BUS_PCI;
470470
dev->input_id.version = 1;

‎drivers/media/pci/dm1105/dm1105.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ static int dm1105_ir_init(struct dm1105_dev *dm1105)
748748

749749
dev->driver_name = MODULE_NAME;
750750
dev->map_name = RC_MAP_DM1105_NEC;
751-
dev->input_name = "DVB on-card IR receiver";
751+
dev->device_name = "DVB on-card IR receiver";
752752
dev->input_phys = dm1105->ir.input_phys;
753753
dev->input_id.bustype = BUS_PCI;
754754
dev->input_id.version = 1;

‎drivers/media/pci/mantis/mantis_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ struct mantis_pci {
176176
struct work_struct uart_work;
177177

178178
struct rc_dev *rc;
179-
char input_name[80];
179+
char device_name[80];
180180
char input_phys[80];
181181
char *rc_map_name;
182182
};

‎drivers/media/pci/mantis/mantis_input.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ int mantis_input_init(struct mantis_pci *mantis)
4646
goto out;
4747
}
4848

49-
snprintf(mantis->input_name, sizeof(mantis->input_name),
49+
snprintf(mantis->device_name, sizeof(mantis->device_name),
5050
"Mantis %s IR receiver", mantis->hwconfig->model_name);
5151
snprintf(mantis->input_phys, sizeof(mantis->input_phys),
5252
"pci-%s/ir0", pci_name(mantis->pdev));
5353

54-
dev->input_name = mantis->input_name;
54+
dev->device_name = mantis->device_name;
5555
dev->input_phys = mantis->input_phys;
5656
dev->input_id.bustype = BUS_PCI;
5757
dev->input_id.vendor = mantis->vendor_id;

‎drivers/media/pci/saa7134/saa7134-input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
870870
if (raw_decode)
871871
rc->driver_type = RC_DRIVER_IR_RAW;
872872

873-
rc->input_name = ir->name;
873+
rc->device_name = ir->name;
874874
rc->input_phys = ir->phys;
875875
rc->input_id.bustype = BUS_PCI;
876876
rc->input_id.version = 1;

‎drivers/media/pci/smipcie/smipcie-ir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@ int smi_ir_init(struct smi_dev *dev)
188188
return -ENOMEM;
189189

190190
/* init input device */
191-
snprintf(ir->input_name, sizeof(ir->input_name), "IR (%s)",
191+
snprintf(ir->device_name, sizeof(ir->device_name), "IR (%s)",
192192
dev->info->name);
193193
snprintf(ir->input_phys, sizeof(ir->input_phys), "pci-%s/ir0",
194194
pci_name(dev->pci_dev));
195195

196196
rc_dev->driver_name = "SMI_PCIe";
197197
rc_dev->input_phys = ir->input_phys;
198-
rc_dev->input_name = ir->input_name;
198+
rc_dev->device_name = ir->device_name;
199199
rc_dev->input_id.bustype = BUS_PCI;
200200
rc_dev->input_id.version = 1;
201201
rc_dev->input_id.vendor = dev->pci_dev->subsystem_vendor;

‎drivers/media/pci/smipcie/smipcie.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ struct smi_rc {
240240
struct smi_dev *dev;
241241
struct rc_dev *rc_dev;
242242
char input_phys[64];
243-
char input_name[64];
243+
char device_name[64];
244244
struct work_struct work;
245245
u8 irData[256];
246246

‎drivers/media/pci/ttpci/budget-ci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
186186
"pci-%s/ir0", pci_name(saa->pci));
187187

188188
dev->driver_name = MODULE_NAME;
189-
dev->input_name = budget_ci->ir.name;
189+
dev->device_name = budget_ci->ir.name;
190190
dev->input_phys = budget_ci->ir.phys;
191191
dev->input_id.bustype = BUS_PCI;
192192
dev->input_id.version = 1;

‎drivers/media/rc/ati_remote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ static void ati_remote_rc_init(struct ati_remote *ati_remote)
766766
rdev->open = ati_remote_rc_open;
767767
rdev->close = ati_remote_rc_close;
768768

769-
rdev->input_name = ati_remote->rc_name;
769+
rdev->device_name = ati_remote->rc_name;
770770
rdev->input_phys = ati_remote->rc_phys;
771771

772772
usb_to_input_id(ati_remote->udev, &rdev->input_id);

‎drivers/media/rc/ene_ir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
10601060
rdev->s_idle = ene_set_idle;
10611061
rdev->driver_name = ENE_DRIVER_NAME;
10621062
rdev->map_name = RC_MAP_RC6_MCE;
1063-
rdev->input_name = "ENE eHome Infrared Remote Receiver";
1063+
rdev->device_name = "ENE eHome Infrared Remote Receiver";
10641064

10651065
if (dev->hw_learning_and_tx_capable) {
10661066
rdev->s_learning_mode = ene_set_learning_mode;
@@ -1070,7 +1070,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
10701070
rdev->s_tx_carrier = ene_set_tx_carrier;
10711071
rdev->s_tx_duty_cycle = ene_set_tx_duty_cycle;
10721072
rdev->s_carrier_report = ene_set_carrier_report;
1073-
rdev->input_name = "ENE eHome Infrared Remote Transceiver";
1073+
rdev->device_name = "ENE eHome Infrared Remote Transceiver";
10741074
}
10751075

10761076
dev->rdev = rdev;

‎drivers/media/rc/fintek-cir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
532532
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
533533
rdev->open = fintek_open;
534534
rdev->close = fintek_close;
535-
rdev->input_name = FINTEK_DESCRIPTION;
535+
rdev->device_name = FINTEK_DESCRIPTION;
536536
rdev->input_phys = "fintek/cir0";
537537
rdev->input_id.bustype = BUS_HOST;
538538
rdev->input_id.vendor = VENDOR_ID_FINTEK;

‎drivers/media/rc/gpio-ir-recv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
150150
}
151151

152152
rcdev->priv = gpio_dev;
153-
rcdev->input_name = GPIO_IR_DEVICE_NAME;
153+
rcdev->device_name = GPIO_IR_DEVICE_NAME;
154154
rcdev->input_phys = GPIO_IR_DEVICE_NAME "/input0";
155155
rcdev->input_id.bustype = BUS_HOST;
156156
rcdev->input_id.vendor = 0x0001;

‎drivers/media/rc/igorplugusb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static int igorplugusb_probe(struct usb_interface *intf,
194194
if (!rc)
195195
goto fail;
196196

197-
rc->input_name = DRIVER_DESC;
197+
rc->device_name = DRIVER_DESC;
198198
rc->input_phys = ir->phys;
199199
usb_to_input_id(udev, &rc->input_id);
200200
rc->dev.parent = &intf->dev;

‎drivers/media/rc/iguanair.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ static int iguanair_probe(struct usb_interface *intf,
487487

488488
usb_make_path(ir->udev, ir->phys, sizeof(ir->phys));
489489

490-
rc->input_name = ir->name;
490+
rc->device_name = ir->name;
491491
rc->input_phys = ir->phys;
492492
usb_to_input_id(ir->udev, &rc->input_id);
493493
rc->dev.parent = &intf->dev;

‎drivers/media/rc/img-ir/img-ir-hw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ int img_ir_probe_hw(struct img_ir_priv *priv)
10831083
rdev->priv = priv;
10841084
rdev->map_name = RC_MAP_EMPTY;
10851085
rdev->allowed_protocols = img_ir_allowed_protos(priv);
1086-
rdev->input_name = "IMG Infrared Decoder";
1086+
rdev->device_name = "IMG Infrared Decoder";
10871087
rdev->s_filter = img_ir_set_normal_filter;
10881088
rdev->s_wakeup_filter = img_ir_set_wakeup_filter;
10891089

‎drivers/media/rc/img-ir/img-ir-raw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ int img_ir_probe_raw(struct img_ir_priv *priv)
117117
}
118118
rdev->priv = priv;
119119
rdev->map_name = RC_MAP_EMPTY;
120-
rdev->input_name = "IMG Infrared Decoder Raw";
120+
rdev->device_name = "IMG Infrared Decoder Raw";
121121

122122
/* Register raw decoder */
123123
error = rc_register_device(rdev);

‎drivers/media/rc/imon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2063,7 +2063,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
20632063
sizeof(ictx->phys_rdev));
20642064
strlcat(ictx->phys_rdev, "/input0", sizeof(ictx->phys_rdev));
20652065

2066-
rdev->input_name = ictx->name_rdev;
2066+
rdev->device_name = ictx->name_rdev;
20672067
rdev->input_phys = ictx->phys_rdev;
20682068
usb_to_input_id(ictx->usbdev_intf0, &rdev->input_id);
20692069
rdev->dev.parent = ictx->dev;

‎drivers/media/rc/ir-hix5hd2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
249249
rdev->driver_name = IR_HIX5HD2_NAME;
250250
map_name = of_get_property(node, "linux,rc-map-name", NULL);
251251
rdev->map_name = map_name ?: RC_MAP_EMPTY;
252-
rdev->input_name = IR_HIX5HD2_NAME;
252+
rdev->device_name = IR_HIX5HD2_NAME;
253253
rdev->input_phys = IR_HIX5HD2_NAME "/input0";
254254
rdev->input_id.bustype = BUS_HOST;
255255
rdev->input_id.vendor = 0x0001;

‎drivers/media/rc/ir-spi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ static int ir_spi_probe(struct spi_device *spi)
155155
idata->rc->tx_ir = ir_spi_tx;
156156
idata->rc->s_tx_carrier = ir_spi_set_tx_carrier;
157157
idata->rc->s_tx_duty_cycle = ir_spi_set_duty_cycle;
158+
idata->rc->device_name = "IR SPI";
158159
idata->rc->driver_name = IR_SPI_DRIVER_NAME;
159160
idata->rc->priv = idata;
160161
idata->spi = spi;

‎drivers/media/rc/ite-cir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
15761576
rdev->s_tx_duty_cycle = ite_set_tx_duty_cycle;
15771577
}
15781578

1579-
rdev->input_name = dev_desc->model;
1579+
rdev->device_name = dev_desc->model;
15801580
rdev->input_id.bustype = BUS_HOST;
15811581
rdev->input_id.vendor = PCI_VENDOR_ID_ITE;
15821582
rdev->input_id.product = 0;

‎drivers/media/rc/mceusb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
12641264

12651265
usb_make_path(ir->usbdev, ir->phys, sizeof(ir->phys));
12661266

1267-
rc->input_name = ir->name;
1267+
rc->device_name = ir->name;
12681268
rc->input_phys = ir->phys;
12691269
usb_to_input_id(ir->usbdev, &rc->input_id);
12701270
rc->dev.parent = dev;

‎drivers/media/rc/meson-ir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static int meson_ir_probe(struct platform_device *pdev)
138138
}
139139

140140
ir->rc->priv = ir;
141-
ir->rc->input_name = DRIVER_NAME;
141+
ir->rc->device_name = DRIVER_NAME;
142142
ir->rc->input_phys = DRIVER_NAME "/input0";
143143
ir->rc->input_id.bustype = BUS_HOST;
144144
map_name = of_get_property(node, "linux,rc-map-name", NULL);

‎drivers/media/rc/mtk-cir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static int mtk_ir_probe(struct platform_device *pdev)
343343
}
344344

345345
ir->rc->priv = ir;
346-
ir->rc->input_name = MTK_IR_DEV;
346+
ir->rc->device_name = MTK_IR_DEV;
347347
ir->rc->input_phys = MTK_IR_DEV "/input0";
348348
ir->rc->input_id.bustype = BUS_HOST;
349349
ir->rc->input_id.vendor = 0x0001;

‎drivers/media/rc/nuvoton-cir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
11341134
rdev->tx_ir = nvt_tx_ir;
11351135
rdev->s_tx_carrier = nvt_set_tx_carrier;
11361136
rdev->s_wakeup_filter = nvt_ir_raw_set_wakeup_filter;
1137-
rdev->input_name = "Nuvoton w836x7hg Infrared Remote Transceiver";
1137+
rdev->device_name = "Nuvoton w836x7hg Infrared Remote Transceiver";
11381138
rdev->input_phys = "nuvoton/cir0";
11391139
rdev->input_id.bustype = BUS_HOST;
11401140
rdev->input_id.vendor = PCI_VENDOR_ID_WINBOND2;

‎drivers/media/rc/rc-loopback.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static int __init loop_init(void)
219219
return -ENOMEM;
220220
}
221221

222-
rc->input_name = "rc-core loopback device";
222+
rc->device_name = "rc-core loopback device";
223223
rc->input_phys = "rc-core/virtual";
224224
rc->input_id.bustype = BUS_VIRTUAL;
225225
rc->input_id.version = 1;

‎drivers/media/rc/rc-main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ u32 rc_g_keycode_from_table(struct rc_dev *dev, u32 scancode)
530530

531531
if (keycode != KEY_RESERVED)
532532
IR_dprintk(1, "%s: scancode 0x%04x keycode 0x%02x\n",
533-
dev->input_name, scancode, keycode);
533+
dev->device_name, scancode, keycode);
534534

535535
return keycode;
536536
}
@@ -663,7 +663,7 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_type protocol,
663663
dev->last_keycode = keycode;
664664

665665
IR_dprintk(1, "%s: key down event, key 0x%04x, protocol 0x%04x, scancode 0x%08x\n",
666-
dev->input_name, keycode, protocol, scancode);
666+
dev->device_name, keycode, protocol, scancode);
667667
input_report_key(dev->input_dev, keycode, 1);
668668

669669
led_trigger_event(led_feedback, LED_FULL);
@@ -1663,7 +1663,7 @@ static int rc_prepare_rx_device(struct rc_dev *dev)
16631663
dev->input_dev->dev.parent = &dev->dev;
16641664
memcpy(&dev->input_dev->id, &dev->input_id, sizeof(dev->input_id));
16651665
dev->input_dev->phys = dev->input_phys;
1666-
dev->input_dev->name = dev->input_name;
1666+
dev->input_dev->name = dev->device_name;
16671667

16681668
return 0;
16691669

@@ -1759,7 +1759,7 @@ int rc_register_device(struct rc_dev *dev)
17591759

17601760
path = kobject_get_path(&dev->dev.kobj, GFP_KERNEL);
17611761
dev_info(&dev->dev, "%s as %s\n",
1762-
dev->input_name ?: "Unspecified device", path ?: "N/A");
1762+
dev->device_name ?: "Unspecified device", path ?: "N/A");
17631763
kfree(path);
17641764

17651765
if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {

‎drivers/media/rc/redrat3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ static struct rc_dev *redrat3_init_rc_dev(struct redrat3_dev *rr3)
951951

952952
usb_make_path(rr3->udev, rr3->phys, sizeof(rr3->phys));
953953

954-
rc->input_name = rr3->name;
954+
rc->device_name = rr3->name;
955955
rc->input_phys = rr3->phys;
956956
usb_to_input_id(rr3->udev, &rc->input_id);
957957
rc->dev.parent = dev;

‎drivers/media/rc/serial_ir.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -513,19 +513,19 @@ static int serial_ir_probe(struct platform_device *dev)
513513

514514
switch (type) {
515515
case IR_HOMEBREW:
516-
rcdev->input_name = "Serial IR type home-brew";
516+
rcdev->device_name = "Serial IR type home-brew";
517517
break;
518518
case IR_IRDEO:
519-
rcdev->input_name = "Serial IR type IRdeo";
519+
rcdev->device_name = "Serial IR type IRdeo";
520520
break;
521521
case IR_IRDEO_REMOTE:
522-
rcdev->input_name = "Serial IR type IRdeo remote";
522+
rcdev->device_name = "Serial IR type IRdeo remote";
523523
break;
524524
case IR_ANIMAX:
525-
rcdev->input_name = "Serial IR type AnimaX";
525+
rcdev->device_name = "Serial IR type AnimaX";
526526
break;
527527
case IR_IGOR:
528-
rcdev->input_name = "Serial IR type IgorPlug";
528+
rcdev->device_name = "Serial IR type IgorPlug";
529529
break;
530530
}
531531

‎drivers/media/rc/sir_ir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ static int sir_ir_probe(struct platform_device *dev)
308308
if (!rcdev)
309309
return -ENOMEM;
310310

311-
rcdev->input_name = "SIR IrDA port";
311+
rcdev->device_name = "SIR IrDA port";
312312
rcdev->input_phys = KBUILD_MODNAME "/input0";
313313
rcdev->input_id.bustype = BUS_HOST;
314314
rcdev->input_id.vendor = 0x0001;

0 commit comments

Comments
 (0)