Commit b4f63e9a authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d9e2d596

drivers/staging/easycap/easycap.h

+19 −0
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include <linux/smp_lock.h>

#include "easycap.h"

#include "easycap_ioctl.h"



/*--------------------------------------------------------------------------*/

/*

drivers/staging/easycap/easycap_ioctl.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*****************************************************************************

*                                                                            *

*  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

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
/****************************************************************************/



#include "easycap.h"

#include "easycap_low.h"



/*--------------------------------------------------------------------------*/

static const struct stk1160config {

drivers/staging/easycap/easycap_low.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*****************************************************************************

*                                                                            *

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