History

V4L/DVB: staging/lirc: fix non-CONFIG_MODULES build horkage

Fix when CONFIG_MODULES is not enabled: drivers/staging/lirc/lirc_parallel.c:243: error: implicit declaration of function 'module_refcount' drivers/staging/lirc/lirc_it87.c:150: error: implicit declaration of function 'module_refcount' drivers/built-in.o: In function `it87_probe': lirc_it87.c:(.text+0x4079b0): undefined reference to `init_chrdev' lirc_it87.c:(.text+0x4079cc): undefined reference to `drop_chrdev' drivers/built-in.o: In function `lirc_it87_exit': lirc_it87.c:(.exit.text+0x38a5): undefined reference to `drop_chrdev' Its a quick hack and untested beyond building, since I don't have the hardware, but it should do the trick.

Jarod Wilson committed 16 years ago

Commit 82ce67b1 parent efce8ca2 files · +8 −5Browse files

Showing the changes to drivers/staging/lirc (2 of 2 files). Show all

Unified · Split

2 files
  1. drivers/staging/lirc/lirc_it87.c +6 −3
  2. drivers/staging/lirc/lirc_parallel.c +2 −2
drivers/staging/lirc/lirc_it87.c+6−3
@@ -109,6 +109,7 @@ static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue); · 108 unmodified lines
109 109
110static DEFINE_SPINLOCK(hardware_lock);110static DEFINE_SPINLOCK(hardware_lock);
111static DEFINE_SPINLOCK(dev_lock);111static DEFINE_SPINLOCK(dev_lock);
112static bool device_open;
112 113
113static int rx_buf[RBUF_LEN];114static int rx_buf[RBUF_LEN];
114unsigned int rx_tail, rx_head;115unsigned int rx_tail, rx_head;
@@ -147,10 +148,11 @@ static void drop_port(void); · 32 unmodified lines
147static int lirc_open(struct inode *inode, struct file *file)148static int lirc_open(struct inode *inode, struct file *file)
148{149{
149 spin_lock(&dev_lock);150 spin_lock(&dev_lock);
150 if (module_refcount(THIS_MODULE)) {151 if (device_open) {
151 spin_unlock(&dev_lock);152 spin_unlock(&dev_lock);
152 return -EBUSY;153 return -EBUSY;
153 }154 }
155 device_open = true;
154 spin_unlock(&dev_lock);156 spin_unlock(&dev_lock);
155 return 0;157 return 0;
156}158}
@@ -158,6 +160,9 @@ static int lirc_open(struct inode *inode, struct file *file) · 1 unmodified line
158 160
159static int lirc_close(struct inode *inode, struct file *file)161static int lirc_close(struct inode *inode, struct file *file)
160{162{
163 spin_lock(&dev_lock);
164 device_open = false;
165 spin_unlock(&dev_lock);
161 return 0;166 return 0;
162}167}
163 168
@@ -363,7 +368,6 @@ static struct lirc_driver driver = { · 199 unmodified lines
363};368};
364 369
365 370
366#ifdef MODULE
367static int init_chrdev(void)371static int init_chrdev(void)
368{372{
369 driver.minor = lirc_register_driver(&driver);373 driver.minor = lirc_register_driver(&driver);
@@ -380,7 +384,6 @@ static void drop_chrdev(void) · 10 unmodified lines
380{384{
381 lirc_unregister_driver(driver.minor);385 lirc_unregister_driver(driver.minor);
382}386}
383#endif
384 387
385 388
386/* SECTION: Hardware */389/* SECTION: Hardware */
drivers/staging/lirc/lirc_parallel.c+2−2
@@ -240,7 +240,7 @@ static void irq_handler(void *blah) · 239 unmodified lines
240 unsigned int level, newlevel;240 unsigned int level, newlevel;
241 unsigned int timeout;241 unsigned int timeout;
242 242
243 if (!module_refcount(THIS_MODULE))243 if (!is_open)
244 return;244 return;
245 245
246 if (!is_claimed)246 if (!is_claimed)
@@ -515,7 +515,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) · 268 unmodified lines
515 515
516static int lirc_open(struct inode *node, struct file *filep)516static int lirc_open(struct inode *node, struct file *filep)
517{517{
518 if (module_refcount(THIS_MODULE) || !lirc_claim())518 if (is_open || !lirc_claim())
519 return -EBUSY;519 return -EBUSY;
520 520
521 parport_enable_irq(pport);521 parport_enable_irq(pport);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t