path: root/include
diff options
authorSean Young <sean@mess.org>2017-09-26 07:31:29 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-12-14 09:58:35 -0500
commit6b319bb72fc9b46e09671b39e6e15596263e9649 (patch)
tree0caafe3650ec243fd531f98223c359389c7c902c /include
parent92a823d9e643f682f0c45d477a7b298fa42756c2 (diff)
media: lirc: move lirc_dev->attached to rc_dev->registered
This is done to further remove the lirc kernel api. Ensure that every fops checks for this. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include')
2 files changed, 3 insertions, 2 deletions
diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
index 14d3eb36672e..5782add67edd 100644
--- a/include/media/lirc_dev.h
+++ b/include/media/lirc_dev.h
@@ -26,7 +26,6 @@
* @rdev: &struct rc_dev associated with the device
* @fops: &struct file_operations for the device
* @owner: the module owning this struct
- * @attached: if the device is still live
* @open: open count for the device's chardev
* @mutex: serialises file_operations calls
* @dev: &struct device assigned to the device
@@ -40,7 +39,6 @@ struct lirc_dev {
const struct file_operations *fops;
struct module *owner;
- bool attached;
int open;
struct mutex mutex; /* protect from simultaneous accesses */
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index fb91666bf881..b6d719734744 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -127,6 +127,8 @@ enum rc_filter_type {
* @wait_poll: poll struct for lirc device
* @send_mode: lirc mode for sending, either LIRC_MODE_SCANCODE or
+ * @registered: set to true by rc_register_device(), false by
+ * rc_unregister_device
* @change_protocol: allow changing the protocol used on hardware decoders
* @open: callback to allow drivers to enable polling/irq when IR input device
* is opened.
@@ -197,6 +199,7 @@ struct rc_dev {
wait_queue_head_t wait_poll;
u8 send_mode;
+ bool registered;
int (*change_protocol)(struct rc_dev *dev, u64 *rc_proto);
int (*open)(struct rc_dev *dev);
void (*close)(struct rc_dev *dev);

Privacy Policy