diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:59:37 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:59:37 -0200 |
| commit | be80b76533c8db5af8ef3464c84d56c45767ed60 (patch) | |
| tree | 4ccb7c9d66f221a8c881332319523c91f10f683d /linux/drivers/media/dvb/dvb-usb/dvb-usb.h | |
| parent | e2273bb85e79b09bafd264fda1832f9fbb4f4ff5 (diff) | |
| download | mediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.gz mediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.bz2 | |
sem2mutex: drivers/media/, #2
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Kernel-sync from patch 3318b
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dvb-usb.h')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h index 5e5d21ad9..bdf596c42 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h @@ -12,6 +12,10 @@ #include <linux/input.h> #include <linux/usb.h> #include <linux/firmware.h> +#include "compat.h" +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#include <linux/mutex.h> +#endif #include "dvb_frontend.h" #include "dvb_demux.h" @@ -227,8 +231,8 @@ struct dvb_usb_properties { * @feedcount: number of reqested feeds (used for streaming-activation) * @pid_filtering: is hardware pid_filtering used or not. * - * @usb_sem: semaphore of USB control messages (reading needs two messages) - * @i2c_sem: semaphore for i2c-transfers + * @usb_mutex: semaphore of USB control messages (reading needs two messages) + * @i2c_mutex: semaphore for i2c-transfers * * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB * @pll_addr: I2C address of the tuner for programming @@ -283,10 +287,18 @@ struct dvb_usb_device { int pid_filtering; /* locking */ - struct semaphore usb_sem; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex usb_mutex; +#else + struct semaphore usb_mutex; +#endif /* i2c */ - struct semaphore i2c_sem; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex i2c_mutex; +#else + struct semaphore i2c_mutex; +#endif struct i2c_adapter i2c_adap; /* tuner programming information */ |