Commit 01c32070 authored by Jorgyano Vieira's avatar Jorgyano Vieira Committed by Greg Kroah-Hartman

Staging: crystalhd: Replace the local includes with global header

This patch replaces the local includes with the global header.
So the the crystalhd.h will be the only header included by the other files.
Signed-off-by: default avatarJorgyano Vieira <jorgyano@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4768f3f0
...@@ -48,8 +48,7 @@ ...@@ -48,8 +48,7 @@
#endif #endif
#include "bc_dts_defs.h" #include "crystalhd.h"
#include "bcm_70012_regs.h" /* Link Register defs */
#define CRYSTALHD_API_NAME "crystalhd" #define CRYSTALHD_API_NAME "crystalhd"
#define CRYSTALHD_API_DEV_NAME "/dev/crystalhd" #define CRYSTALHD_API_DEV_NAME "/dev/crystalhd"
......
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
* along with this driver. If not, see <http://www.gnu.org/licenses/>. * along with this driver. If not, see <http://www.gnu.org/licenses/>.
**********************************************************************/ **********************************************************************/
#include "crystalhd_cmds.h" #include "crystalhd.h"
#include "crystalhd_hw.h"
static struct crystalhd_user *bc_cproc_get_uid(struct crystalhd_cmd *ctx) static struct crystalhd_user *bc_cproc_get_uid(struct crystalhd_cmd *ctx)
{ {
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
* from _dts_glob and dts_defs etc.. which are defined for * from _dts_glob and dts_defs etc.. which are defined for
* windows. * windows.
*/ */
#include "crystalhd_misc.h"
#include "crystalhd_hw.h" #include "crystalhd.h"
enum crystalhd_state { enum crystalhd_state {
BC_LINK_INVALID = 0x00, BC_LINK_INVALID = 0x00,
......
...@@ -22,10 +22,11 @@ ...@@ -22,10 +22,11 @@
* along with this driver. If not, see <http://www.gnu.org/licenses/>. * along with this driver. If not, see <http://www.gnu.org/licenses/>.
**********************************************************************/ **********************************************************************/
#include "crystalhd.h"
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "crystalhd_hw.h"
/* Functions internal to this file */ /* Functions internal to this file */
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#ifndef _CRYSTALHD_HW_H_ #ifndef _CRYSTALHD_HW_H_
#define _CRYSTALHD_HW_H_ #define _CRYSTALHD_HW_H_
#include "crystalhd_misc.h" #include "crystalhd.h"
#include "crystalhd_fw_if.h"
/* HW constants..*/ /* HW constants..*/
#define DMA_ENGINE_CNT 2 #define DMA_ENGINE_CNT 2
......
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
along with this driver. If not, see <http://www.gnu.org/licenses/>. along with this driver. If not, see <http://www.gnu.org/licenses/>.
***************************************************************************/ ***************************************************************************/
#include "crystalhd.h"
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "crystalhd_lnx.h"
static DEFINE_MUTEX(chd_dec_mutex); static DEFINE_MUTEX(chd_dec_mutex);
static struct class *crystalhd_class; static struct class *crystalhd_class;
......
/*************************************************************************** /***************************************************************************
* Copyright (c) 2005-2009, Broadcom Corporation. * Copyright (c) 2005-2009, Broadcom Corporation.
* *
* Name: crystalhd_lnx . c * Name: crystalhd_lnx . h
* *
* Description: * Description:
* BCM70012 Linux driver * BCM70012 Linux driver
...@@ -48,11 +48,10 @@ ...@@ -48,11 +48,10 @@
#include <asm/system.h> #include <asm/system.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include "crystalhd_cmds.h" #include "crystalhd.h"
#define CRYSTAL_HD_NAME "Broadcom Crystal HD Decoder (BCM70012) Driver" #define CRYSTAL_HD_NAME "Broadcom Crystal HD Decoder (BCM70012) Driver"
/* OS specific PCI information structure and adapter information. */ /* OS specific PCI information structure and adapter information. */
struct crystalhd_adp { struct crystalhd_adp {
/* Hardware borad/PCI specifics */ /* Hardware borad/PCI specifics */
......
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
* along with this driver. If not, see <http://www.gnu.org/licenses/>. * along with this driver. If not, see <http://www.gnu.org/licenses/>.
**********************************************************************/ **********************************************************************/
#include <linux/slab.h> #include "crystalhd.h"
#include "crystalhd_misc.h" #include <linux/slab.h>
#include "crystalhd_lnx.h"
uint32_t g_linklog_level; uint32_t g_linklog_level;
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#ifndef _CRYSTALHD_MISC_H_ #ifndef _CRYSTALHD_MISC_H_
#define _CRYSTALHD_MISC_H_ #define _CRYSTALHD_MISC_H_
#include "crystalhd.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -35,8 +37,6 @@ ...@@ -35,8 +37,6 @@
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/system.h>
#include "bc_dts_glob_lnx.h"
/* Global log level variable defined in crystal_misc.c file */ /* Global log level variable defined in crystal_misc.c file */
extern uint32_t g_linklog_level; extern uint32_t g_linklog_level;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment