diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-11-06 23:02:07 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-11-06 23:02:07 +0100 |
| commit | 17490135b2a7a46fc7fb67d64dbaeb1301ea169d (patch) | |
| tree | ec2be7de80c0f602779117978288d22bd4e563e9 /v4l/compat.h | |
| parent | 38b18774cf9f1daa3a6e09a3767ce537997f6f73 (diff) | |
| download | mediapointer-dvb-s2-17490135b2a7a46fc7fb67d64dbaeb1301ea169d.tar.gz mediapointer-dvb-s2-17490135b2a7a46fc7fb67d64dbaeb1301ea169d.tar.bz2 | |
v4l: fix dev_set_name compiler errors for kernels < 2.6.26
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l/compat.h')
| -rw-r--r-- | v4l/compat.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 7325e15c4..3c0c2e345 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -18,6 +18,7 @@ #ifdef CONFIG_PROC_FS #include <linux/module.h> #include <linux/proc_fs.h> +#include <linux/device.h> #endif #endif @@ -210,6 +211,10 @@ static inline struct proc_dir_entry *proc_create_data(const char *a, #define hweight64(x) generic_hweight64(x) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) +typedef unsigned long uintptr_t; +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) #define div64_u64(a,b) div64_64(a,b) @@ -219,20 +224,17 @@ static inline struct proc_dir_entry *proc_create_data(const char *a, ( h ), \ ( x ) ) ) -#define dev_name(dev) ((dev)->bus_id) - -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) -typedef unsigned long uintptr_t; -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) static inline int list_is_singular(const struct list_head *head) { return !list_empty(head) && (head->next == head->prev); } +#define dev_name(dev) ((dev)->bus_id) + +#define dev_set_name(dev, fmt, arg...) ({ \ + snprintf((dev)->bus_id, sizeof((dev)->bus_id), fmt , ## arg); \ + 0; \ +}) #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) |