summaryrefslogtreecommitdiff
path: root/drivers/staging/easycap/easycap_ioctl.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2011-02-03 13:42:40 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 12:44:31 -0800
commit3fc0dae888ee216036ae1898fc9186f1dd04f185 (patch)
tree924e2c2516d8ca749108969f3f69c04680aa002d /drivers/staging/easycap/easycap_ioctl.c
parentf2b3c685b9b1c048cfa8bef98dac037275b9d20d (diff)
staging/easycap: repace #if defined with simpler #ifdef
for sake of readability replace #if defined with #ifdef and #if (!defined with #ifndef Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap_ioctl.c')
-rw-r--r--drivers/staging/easycap/easycap_ioctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c
index ee581c4f8037..4754f2ffc8ef 100644
--- a/drivers/staging/easycap/easycap_ioctl.c
+++ b/drivers/staging/easycap/easycap_ioctl.c
@@ -1387,7 +1387,7 @@ case VIDIOC_G_CTRL: {
break;
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#if defined(VIDIOC_S_CTRL_OLD)
+#ifdef VIDIOC_S_CTRL_OLD
case VIDIOC_S_CTRL_OLD: {
JOM(8, "VIDIOC_S_CTRL_OLD required at least for xawtv\n");
}
@@ -2156,7 +2156,7 @@ case VIDIOC_QBUF: {
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
case VIDIOC_DQBUF:
{
-#if defined(AUDIOTIME)
+#ifdef AUDIOTIME
struct signed_div_result sdr;
long long int above, below, dnbydt, fudge, sll;
unsigned long long int ull;
@@ -2269,7 +2269,7 @@ case VIDIOC_DQBUF:
do_gettimeofday(&timeval);
timeval2 = timeval;
-#if defined(AUDIOTIME)
+#ifdef AUDIOTIME
if (!peasycap->timeval0.tv_sec) {
timeval8 = timeval;
timeval1 = timeval;
@@ -2389,7 +2389,7 @@ case VIDIOC_STREAMOFF: {
/*---------------------------------------------------------------------------*/
JOM(8, "calling wake_up on wq_video and wq_audio\n");
wake_up_interruptible(&(peasycap->wq_video));
-#if defined(EASYCAP_NEEDS_ALSA)
+#ifdef EASYCAP_NEEDS_ALSA
if (NULL != peasycap->psubstream)
snd_pcm_period_elapsed(peasycap->psubstream);
#else