Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 518f4b26 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent db68102c

drivers/hid/hid-picolcd_cir.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report) 
	rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;

	rdev->open             = picolcd_cir_open;

	rdev->close            = picolcd_cir_close;

	rdev->input_name       = data->hdev->name;

	rdev->device_name      = data->hdev->name;

	rdev->input_phys       = data->hdev->phys;

	rdev->input_id.bustype = data->hdev->bus;

	rdev->input_id.vendor  = data->hdev->vendor;

drivers/media/cec/cec-core.c

+2 −2
Original line number Diff line number Diff line
@@ -263,12 +263,12 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops, 
		return ERR_PTR(-ENOMEM);

	}



	snprintf(adap->input_name, sizeof(adap->input_name),

	snprintf(adap->device_name, sizeof(adap->device_name),

		 "RC for %s", name);

	snprintf(adap->input_phys, sizeof(adap->input_phys),

		 "%s/input0", name);



	adap->rc->input_name = adap->input_name;

	adap->rc->device_name = adap->device_name;

	adap->rc->input_phys = adap->input_phys;

	adap->rc->input_id.bustype = BUS_CEC;

	adap->rc->input_id.vendor = 0;

drivers/media/common/siano/smsir.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int sms_ir_init(struct smscore_device_t *coredev) 
	strlcpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys));

	strlcat(coredev->ir.phys, "/ir0", sizeof(coredev->ir.phys));



	dev->input_name = coredev->ir.name;

	dev->device_name = coredev->ir.name;

	dev->input_phys = coredev->ir.phys;

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



	pr_debug("Input device (IR) %s is set for key events\n",

		 dev->input_name);

		 dev->device_name);



	err = rc_register_device(dev);

	if (err < 0) {

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

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	 */

	rc->input_id.bustype = BUS_I2C;

	rc->input_phys       = ir->phys;

	rc->input_name	     = ir->name;

	rc->device_name	     = ir->name;



	/*

	 * Initialize the other fields of rc_dev

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

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ int bttv_input_init(struct bttv *btv) 
	snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",

		 pci_name(btv->c.pci));



	rc->input_name = ir->name;

	rc->device_name = ir->name;

	rc->input_phys = ir->phys;

	rc->input_id.bustype = BUS_PCI;

	rc->input_id.version = 1;