From b4f63e9a0f1ca7c6df1f77fdabd4905f4639e8c6 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Sun, 23 Jan 2011 01:13:54 +0200 Subject: [PATCH] staging: easycap: remove redunant headers place all globals to easycap.h, which is included by all c-files easycap_standard: fix declaration vs. definiton conflict Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/easycap/easycap.h | 19 +++++++++++++ drivers/staging/easycap/easycap_ioctl.c | 1 - drivers/staging/easycap/easycap_ioctl.h | 35 ------------------------ drivers/staging/easycap/easycap_low.c | 1 - drivers/staging/easycap/easycap_low.h | 32 ---------------------- drivers/staging/easycap/easycap_main.c | 1 - drivers/staging/easycap/easycap_main.h | 44 ------------------------------ drivers/staging/easycap/easycap_settings.c | 1 - drivers/staging/easycap/easycap_settings.h | 35 ------------------------ drivers/staging/easycap/easycap_sound.c | 1 - drivers/staging/easycap/easycap_sound.h | 40 --------------------------- drivers/staging/easycap/easycap_testcard.c | 1 - drivers/staging/easycap/easycap_testcard.h | 32 ---------------------- 13 files changed, 19 insertions(+), 224 deletions(-) delete mode 100644 drivers/staging/easycap/easycap_ioctl.h delete mode 100644 drivers/staging/easycap/easycap_low.h delete mode 100644 drivers/staging/easycap/easycap_main.h delete mode 100644 drivers/staging/easycap/easycap_settings.h delete mode 100644 drivers/staging/easycap/easycap_sound.h delete mode 100644 drivers/staging/easycap/easycap_testcard.h diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index 337c9bdcfe4d..26bb25f7fe7c 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -727,4 +727,23 @@ extern int easycap_debug; } while (0) /*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ +/* globals + */ +/*---------------------------------------------------------------------------*/ + +extern const struct easycap_standard easycap_standard[]; +extern struct easycap_format easycap_format[]; +extern struct v4l2_queryctrl easycap_control[]; +extern struct usb_driver easycap_usb_driver; +extern struct easycap_dongle easycapdc60_dongle[]; +#if defined(EASYCAP_NEEDS_ALSA) +extern struct snd_pcm_ops easycap_alsa_ops; +extern struct snd_pcm_hardware easycap_pcm_hardware; +extern struct snd_card *psnd_card; +#else +extern struct usb_class_driver easyoss_class; +extern const struct file_operations easyoss_fops; +#endif /*EASYCAP_NEEDS_ALSA*/ + #endif /*EASYCAP_H*/ diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c index 535a62b96e14..bb2ee315c0ec 100644 --- a/drivers/staging/easycap/easycap_ioctl.c +++ b/drivers/staging/easycap/easycap_ioctl.c @@ -27,7 +27,6 @@ #include #include "easycap.h" -#include "easycap_ioctl.h" /*--------------------------------------------------------------------------*/ /* diff --git a/drivers/staging/easycap/easycap_ioctl.h b/drivers/staging/easycap/easycap_ioctl.h deleted file mode 100644 index 245386fd26ff..000000000000 --- a/drivers/staging/easycap/easycap_ioctl.h +++ /dev/null @@ -1,35 +0,0 @@ -/***************************************************************************** -* * -* easycap_ioctl.h * -* * -*****************************************************************************/ -/* - * - * Copyright (C) 2010 R.M. Thomas - * - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/*****************************************************************************/ -#if !defined(EASYCAP_IOCTL_H) -#define EASYCAP_IOCTL_H - -extern struct easycap_dongle easycapdc60_dongle[]; -extern struct easycap_standard easycap_standard[]; -extern struct easycap_format easycap_format[]; -extern struct v4l2_queryctrl easycap_control[]; - -#endif /*EASYCAP_IOCTL_H*/ diff --git a/drivers/staging/easycap/easycap_low.c b/drivers/staging/easycap/easycap_low.c index ca48654573da..6ab335a1e6d6 100644 --- a/drivers/staging/easycap/easycap_low.c +++ b/drivers/staging/easycap/easycap_low.c @@ -39,7 +39,6 @@ /****************************************************************************/ #include "easycap.h" -#include "easycap_low.h" /*--------------------------------------------------------------------------*/ static const struct stk1160config { diff --git a/drivers/staging/easycap/easycap_low.h b/drivers/staging/easycap/easycap_low.h deleted file mode 100644 index 7f3b393dca6e..000000000000 --- a/drivers/staging/easycap/easycap_low.h +++ /dev/null @@ -1,32 +0,0 @@ -/***************************************************************************** -* * -* easycap_low.h * -* * -*****************************************************************************/ -/* - * - * Copyright (C) 2010 R.M. Thomas - * - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/*****************************************************************************/ -#if !defined(EASYCAP_LOW_H) -#define EASYCAP_LOW_H - -extern struct easycap_dongle easycapdc60_dongle[]; - -#endif /*EASYCAP_LOW_H*/ diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index a13418125ef1..b15493e9da93 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/drivers/staging/easycap/easycap_main.c @@ -29,7 +29,6 @@ /*****************************************************************************/ #include "easycap.h" -#include "easycap_main.h" int easycap_debug; static int easycap_bars = 1; diff --git a/drivers/staging/easycap/easycap_main.h b/drivers/staging/easycap/easycap_main.h deleted file mode 100644 index 4c8577c92e43..000000000000 --- a/drivers/staging/easycap/easycap_main.h +++ /dev/null @@ -1,44 +0,0 @@ -/***************************************************************************** -* * -* easycap_main.h * -* * -*****************************************************************************/ -/* - * - * Copyright (C) 2010 R.M. Thomas - * - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/*****************************************************************************/ -#if !defined(EASYCAP_MAIN_H) -#define EASYCAP_MAIN_H - -extern struct easycap_standard easycap_standard[]; -extern struct easycap_format easycap_format[]; -extern struct v4l2_queryctrl easycap_control[]; -extern struct usb_driver easycap_usb_driver; -extern struct easycap_dongle easycapdc60_dongle[]; -#if defined(EASYCAP_NEEDS_ALSA) -extern struct snd_pcm_ops easycap_alsa_ops; -extern struct snd_pcm_hardware easycap_pcm_hardware; -extern struct snd_card *psnd_card; -#else -extern struct usb_class_driver easyoss_class; -extern const struct file_operations easyoss_fops; -#endif /*EASYCAP_NEEDS_ALSA*/ - -#endif /*EASYCAP_MAIN_H*/ diff --git a/drivers/staging/easycap/easycap_settings.c b/drivers/staging/easycap/easycap_settings.c index 3a5295738c1c..6ae1a73099fd 100644 --- a/drivers/staging/easycap/easycap_settings.c +++ b/drivers/staging/easycap/easycap_settings.c @@ -26,7 +26,6 @@ /*****************************************************************************/ #include "easycap.h" -#include "easycap_settings.h" /*---------------------------------------------------------------------------*/ /* diff --git a/drivers/staging/easycap/easycap_settings.h b/drivers/staging/easycap/easycap_settings.h deleted file mode 100644 index fa13f5831f57..000000000000 --- a/drivers/staging/easycap/easycap_settings.h +++ /dev/null @@ -1,35 +0,0 @@ -/***************************************************************************** -* * -* easycap_settings.h * -* * -*****************************************************************************/ -/* - * - * Copyright (C) 2010 R.M. Thomas - * - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/*****************************************************************************/ -#if !defined(EASYCAP_SETTINGS_H) -#define EASYCAP_SETTINGS_H - -extern const struct easycap_standard easycap_standard[]; -extern struct v4l2_queryctrl easycap_control[]; -extern struct easycap_format easycap_format[]; -extern struct easycap_dongle easycapdc60_dongle[]; - -#endif /*EASYCAP_SETTINGS_H*/ diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/easycap/easycap_sound.c index 4bfaf06fb32a..d539e2886a2b 100644 --- a/drivers/staging/easycap/easycap_sound.c +++ b/drivers/staging/easycap/easycap_sound.c @@ -29,7 +29,6 @@ /*****************************************************************************/ #include "easycap.h" -#include "easycap_sound.h" #if defined(EASYCAP_NEEDS_ALSA) /*--------------------------------------------------------------------------*/ diff --git a/drivers/staging/easycap/easycap_sound.h b/drivers/staging/easycap/easycap_sound.h deleted file mode 100644 index ffcd6f203cca..000000000000 --- a/drivers/staging/easycap/easycap_sound.h +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************************** -* * -* easycap_sound.h * -* * -*****************************************************************************/ -/* - * - * Copyright (C) 2010 R.M. Thomas - * - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/*****************************************************************************/ -#if !defined(EASYCAP_SOUND_H) -#define EASYCAP_SOUND_H - -extern struct easycap_dongle easycapdc60_dongle[]; -extern struct easycap *peasycap; -extern struct usb_driver easycap_usb_driver; -#if defined(EASYCAP_NEEDS_ALSA) -extern struct snd_pcm_hardware easycap_pcm_hardware; -#else -extern struct usb_class_driver easyoss_class; -extern const struct file_operations easyoss_fops; -#endif /*EASYCAP_NEEDS_ALSA*/ - -#endif /*EASYCAP_SOUND_H*/ diff --git a/drivers/staging/easycap/easycap_testcard.c b/drivers/staging/easycap/easycap_testcard.c index 1089603f2499..0f8336b6510f 100644 --- a/drivers/staging/easycap/easycap_testcard.c +++ b/drivers/staging/easycap/easycap_testcard.c @@ -26,7 +26,6 @@ /*****************************************************************************/ #include "easycap.h" -#include "easycap_testcard.h" /*****************************************************************************/ #define TESTCARD_BYTESPERLINE (2 * 720) diff --git a/drivers/staging/easycap/easycap_testcard.h b/drivers/staging/easycap/easycap_testcard.h deleted file mode 100644 index 2a21e7cfd8a5..000000000000 --- a/drivers/staging/easycap/easycap_testcard.h +++ /dev/null @@ -1,32 +0,0 @@ -/***************************************************************************** -* * -* easycap_testcard.h * -* * -*****************************************************************************/ -/* - * - * Copyright (C) 2010 R.M. Thomas - * - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/*****************************************************************************/ -#if !defined(EASYCAP_TESTCARD_H) -#define EASYCAP_TESTCARD_H - -extern struct easycap_dongle easycapdc60_dongle[]; - -#endif /*EASYCAP_TESTCARD_H*/ -- 2.11.0