summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndi Shyti <andi.shyti@samsung.com>2016-12-16 06:50:58 -0200
committerTao Huang <huangtao@rock-chips.com>2018-12-10 20:36:07 +0800
commita79753fccdb363e0a9034c176189ff03859cf53f (patch)
tree44ea5e5ef9e30afb2d9654a2680ffbd074669424 /include
parentd4c89c5dcb41a74ec08cfe77d441ef36cf2ccbe5 (diff)
UPSTREAM: [media] rc-main: assign driver type during allocation
The driver type can be assigned immediately when an RC device requests to the framework to allocate the device. This is an 'enum rc_driver_type' data type and specifies whether the device is a raw receiver or scancode receiver. The type will be given as parameter to the rc_allocate_device device. Change accordingly all the drivers calling rc_allocate_device() so that the device type is specified during the rc device allocation. Whenever the device type is not specified, it will be set as RC_DRIVER_SCANCODE which was the default '0' value. Suggested-by: Sean Young <sean@mess.org> Signed-off-by: Andi Shyti <andi.shyti@samsung.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> (cherry picked from commit 0f7499fddb153a333dff3c1dc4280c178b9b5a80) Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com> Note: it didn't change anything due to we didn't need the rc_dev Conflicts: drivers/media/pci/cx23885/cx23885-input.c drivers/media/pci/smipcie/smipcie-ir.c drivers/media/rc/igorplugusb.c drivers/media/rc/nuvoton-cir.c drivers/media/rc/redrat3.c
Diffstat (limited to 'include')
-rw-r--r--include/media/rc-core.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 62a8078419cf..0b3a783cb2c1 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -203,17 +203,19 @@ struct rc_dev {
/**
* rc_allocate_device - Allocates a RC device
*
+ * @rc_driver_type: specifies the type of the RC output to be allocated
* returns a pointer to struct rc_dev.
*/
-struct rc_dev *rc_allocate_device(void);
+struct rc_dev *rc_allocate_device(enum rc_driver_type);
/**
* devm_rc_allocate_device - Managed RC device allocation
*
* @dev: pointer to struct device
+ * @rc_driver_type: specifies the type of the RC output to be allocated
* returns a pointer to struct rc_dev.
*/
-struct rc_dev *devm_rc_allocate_device(struct device *dev);
+struct rc_dev *devm_rc_allocate_device(struct device *dev, enum rc_driver_type);
/**
* rc_free_device - Frees a RC device