summaryrefslogtreecommitdiff
path: root/drivers/media/rc/lirc_dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/rc/lirc_dev.c')
-rw-r--r--drivers/media/rc/lirc_dev.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index a2c5ed0181c1..e381a1c04bea 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -35,7 +35,7 @@
static dev_t lirc_base_dev;
struct irctl {
- struct lirc_driver d;
+ struct lirc_dev d;
bool attached;
int open;
@@ -76,7 +76,7 @@ static void lirc_release(struct device *ld)
static int lirc_allocate_buffer(struct irctl *ir)
{
int err = 0;
- struct lirc_driver *d = &ir->d;
+ struct lirc_dev *d = &ir->d;
if (d->rbuf) {
ir->buf = d->rbuf;
@@ -103,7 +103,7 @@ out:
return err;
}
-int lirc_register_driver(struct lirc_driver *d)
+int lirc_register_device(struct lirc_dev *d)
{
struct irctl *ir;
int minor;
@@ -204,9 +204,9 @@ int lirc_register_driver(struct lirc_driver *d)
return 0;
}
-EXPORT_SYMBOL(lirc_register_driver);
+EXPORT_SYMBOL(lirc_register_device);
-void lirc_unregister_driver(struct lirc_driver *d)
+void lirc_unregister_device(struct lirc_dev *d)
{
struct irctl *ir;
@@ -234,7 +234,7 @@ void lirc_unregister_driver(struct lirc_driver *d)
ida_simple_remove(&lirc_ida, d->minor);
put_device(&ir->dev);
}
-EXPORT_SYMBOL(lirc_unregister_driver);
+EXPORT_SYMBOL(lirc_unregister_device);
int lirc_dev_fop_open(struct inode *inode, struct file *file)
{