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 <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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*/

drivers/staging/easycap/easycap_ioctl.c

@@ -27,7 +27,6 @@
 
 #include <linux/smp_lock.h>
 #include "easycap.h"
-#include "easycap_ioctl.h"
 
 /*--------------------------------------------------------------------------*/
 /*

drivers/staging/easycap/easycap_ioctl.h

-/*****************************************************************************
-*                                                                            *
-*  easycap_ioctl.h                                                           *
-*                                                                            *
-*****************************************************************************/
-/*
- *
- *  Copyright (C) 2010 R.M. Thomas  <rmthomas@sciolus.org>
- *
- *
- *  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*/

drivers/staging/easycap/easycap_low.c

@@ -39,7 +39,6 @@
 /****************************************************************************/
 
 #include "easycap.h"
-#include "easycap_low.h"
 
 /*--------------------------------------------------------------------------*/
 static const struct stk1160config {

drivers/staging/easycap/easycap_low.h

-/*****************************************************************************
-*                                                                            *
-*  easycap_low.h                                                             *
-*                                                                            *
-*****************************************************************************/
-/*
- *
- *  Copyright (C) 2010 R.M. Thomas  <rmthomas@sciolus.org>
- *
- *
- *  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*/

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;

drivers/staging/easycap/easycap_main.h

-/*****************************************************************************
-*                                                                            *
-*  easycap_main.h                                                           *
-*                                                                            *
-*****************************************************************************/
-/*
- *
- *  Copyright (C) 2010 R.M. Thomas  <rmthomas@sciolus.org>
- *
- *
- *  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*/

drivers/staging/easycap/easycap_settings.c

@@ -26,7 +26,6 @@
 /*****************************************************************************/
 
 #include "easycap.h"
-#include "easycap_settings.h"
 
 /*---------------------------------------------------------------------------*/
 /*

drivers/staging/easycap/easycap_settings.h

-/*****************************************************************************
-*                                                                            *
-*  easycap_settings.h                                                        *
-*                                                                            *
-*****************************************************************************/
-/*
- *
- *  Copyright (C) 2010 R.M. Thomas  <rmthomas@sciolus.org>
- *
- *
- *  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*/

drivers/staging/easycap/easycap_sound.c

@@ -29,7 +29,6 @@
 /*****************************************************************************/
 
 #include "easycap.h"
-#include "easycap_sound.h"
 
 #if defined(EASYCAP_NEEDS_ALSA)
 /*--------------------------------------------------------------------------*/

drivers/staging/easycap/easycap_sound.h

-/*****************************************************************************
-*                                                                            *
-*  easycap_sound.h                                                           *
-*                                                                            *
-*****************************************************************************/
-/*
- *
- *  Copyright (C) 2010 R.M. Thomas  <rmthomas@sciolus.org>
- *
- *
- *  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*/

drivers/staging/easycap/easycap_testcard.c

@@ -26,7 +26,6 @@
 /*****************************************************************************/
 
 #include "easycap.h"
-#include "easycap_testcard.h"
 
 /*****************************************************************************/
 #define TESTCARD_BYTESPERLINE (2 * 720)

drivers/staging/easycap/easycap_testcard.h

-/*****************************************************************************
-*                                                                            *
-*  easycap_testcard.h                                                        *
-*                                                                            *
-*****************************************************************************/
-/*
- *
- *  Copyright (C) 2010 R.M. Thomas  <rmthomas@sciolus.org>
- *
- *
- *  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*/