From df0462e77e9aa19d50dbfd540e78f1803e992c25 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 15 Jun 2008 19:39:55 -0300 Subject: [PATCH] V4L/DVB (8289): sms1xxx: remove #if LINUX_VERSION_CODE checks Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/siano/smscoreapi.c | 5 +---- drivers/media/dvb/siano/smscoreapi.h | 1 - 2 files changed, 1 insertion(+), 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) } - void list_add_locked(struct list_head *new, struct list_head *head, spinlock_t *lock) { @@ -592,7 +591,6 @@ int smscore_load_firmware_from_file(struct smscore_device_t *coredev, loadfirmware_t loadfirmware_handler) { int rc = -ENOENT; - const struct firmware *fw; u8 *fw_buffer; @@ -1228,8 +1226,7 @@ int smscore_map_common_buffer(struct smscore_device_t *coredev, if (remap_pfn_range(vma, start, coredev->common_buffer_phys >> PAGE_SHIFT, - size, pgprot_noncached(vma->vm_page_prot))) - { + size, pgprot_noncached(vma->vm_page_prot))) { printk(KERN_INFO "%s remap_page_range failed\n", __func__); return -EAGAIN; } 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; #define kmutex_trylock(_p_) mutex_trylock(_p_) #define kmutex_unlock(_p_) mutex_unlock(_p_) - #ifndef min #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -- 2.20.1