aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/siano/smscoreapi.c5
-rw-r--r--drivers/media/dvb/siano/smscoreapi.h1
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 89fb5a73fc6f..6b9f512a357d 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -200,7 +200,6 @@ void smscore_registry_settype(char *devpath, enum sms_device_type_st type)
200} 200}
201 201
202 202
203
204void list_add_locked(struct list_head *new, struct list_head *head, 203void list_add_locked(struct list_head *new, struct list_head *head,
205 spinlock_t *lock) 204 spinlock_t *lock)
206{ 205{
@@ -592,7 +591,6 @@ int smscore_load_firmware_from_file(struct smscore_device_t *coredev,
592 loadfirmware_t loadfirmware_handler) 591 loadfirmware_t loadfirmware_handler)
593{ 592{
594 int rc = -ENOENT; 593 int rc = -ENOENT;
595
596 const struct firmware *fw; 594 const struct firmware *fw;
597 u8 *fw_buffer; 595 u8 *fw_buffer;
598 596
@@ -1228,8 +1226,7 @@ int smscore_map_common_buffer(struct smscore_device_t *coredev,
1228 1226
1229 if (remap_pfn_range(vma, start, 1227 if (remap_pfn_range(vma, start,
1230 coredev->common_buffer_phys >> PAGE_SHIFT, 1228 coredev->common_buffer_phys >> PAGE_SHIFT,
1231 size, pgprot_noncached(vma->vm_page_prot))) 1229 size, pgprot_noncached(vma->vm_page_prot))) {
1232 {
1233 printk(KERN_INFO "%s remap_page_range failed\n", __func__); 1230 printk(KERN_INFO "%s remap_page_range failed\n", __func__);
1234 return -EAGAIN; 1231 return -EAGAIN;
1235 } 1232 }
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index be98baf3085e..355c22b1d158 100644
--- a/drivers/media/dvb/siano/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -43,7 +43,6 @@ typedef struct mutex kmutex_t;
43#define kmutex_trylock(_p_) mutex_trylock(_p_) 43#define kmutex_trylock(_p_) mutex_trylock(_p_)
44#define kmutex_unlock(_p_) mutex_unlock(_p_) 44#define kmutex_unlock(_p_) mutex_unlock(_p_)
45 45
46
47#ifndef min 46#ifndef min
48#define min(a, b) (((a) < (b)) ? (a) : (b)) 47#define min(a, b) (((a) < (b)) ? (a) : (b))
49#endif 48#endif
n class="hl opt">} EXPORT_SYMBOL_GPL(ks0108_isinited); /* * Module Init & Exit */ static int __init ks0108_init(void) { int result; int ret = -EINVAL; ks0108_parport = parport_find_base(ks0108_port); if (ks0108_parport == NULL) { printk(KERN_ERR KS0108_NAME ": ERROR: " "parport didn't find %i port\n", ks0108_port); goto none; } ks0108_pardevice = parport_register_device(ks0108_parport, KS0108_NAME, NULL, NULL, NULL, PARPORT_DEV_EXCL, NULL); if (ks0108_pardevice == NULL) { printk(KERN_ERR KS0108_NAME ": ERROR: " "parport didn't register new device\n"); goto none; } result = parport_claim(ks0108_pardevice); if (result != 0) { printk(KERN_ERR KS0108_NAME ": ERROR: " "can't claim %i parport, maybe in use\n", ks0108_port); ret = result; goto registered; } ks0108_inited = 1; return 0; registered: parport_unregister_device(ks0108_pardevice); none: return ret; } static void __exit ks0108_exit(void) { parport_release(ks0108_pardevice); parport_unregister_device(ks0108_pardevice); } module_init(ks0108_init); module_exit(ks0108_exit); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>"); MODULE_DESCRIPTION("ks0108 LCD Controller driver");