summaryrefslogtreecommitdiff
path: root/linux/drivers/media/radio/radio-maestro.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-07 16:44:12 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-07 16:44:12 -0300
commit8bcf3778dec0c2761e4b60ae146ba59a6aea47b1 (patch)
tree796f50c10913d6025209c94ad60e90b1d3798fb7 /linux/drivers/media/radio/radio-maestro.c
parentc16847ee7c51d1c925e26eb15cef739faa382afc (diff)
downloadmediapointer-dvb-s2-8bcf3778dec0c2761e4b60ae146ba59a6aea47b1.tar.gz
mediapointer-dvb-s2-8bcf3778dec0c2761e4b60ae146ba59a6aea47b1.tar.bz2
Radio-maestro.c cleanup
From: Douglas Landgraf <dougsland@gmail.com> Removed unnecessary semaphore. Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/radio/radio-maestro.c')
-rw-r--r--linux/drivers/media/radio/radio-maestro.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/linux/drivers/media/radio/radio-maestro.c b/linux/drivers/media/radio/radio-maestro.c
index 792116a91..5867ccd9d 100644
--- a/linux/drivers/media/radio/radio-maestro.c
+++ b/linux/drivers/media/radio/radio-maestro.c
@@ -25,9 +25,6 @@
#include <asm/io.h>
#include <asm/uaccess.h>
#include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
-#include <linux/mutex.h>
-#endif
#include <linux/pci.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
@@ -113,11 +110,6 @@ struct radio_device {
muted, /* VIDEO_AUDIO_MUTE */
stereo, /* VIDEO_TUNER_STEREO_ON */
tuned; /* signal strength (0 or 0xffff) */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
- struct mutex lock;
-#else
- struct semaphore lock;
-#endif
};
static u32 radio_bits_get(struct radio_device *dev)
@@ -401,7 +393,6 @@ static int __devinit maestro_probe(struct pci_dev *pdev,
}
radio_unit->io = pci_resource_start(pdev, 0) + GPIO_DATA;
- mutex_init(&radio_unit->lock);
maestro_radio_inst = video_device_alloc();
if (maestro_radio_inst == NULL) {