From 01c3207091a67b898ce52b74afbee23a0b2b2ea6 Mon Sep 17 00:00:00 2001 From: Jorgyano Vieira Date: Sat, 25 Feb 2012 21:58:21 -0200 Subject: 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: Jorgyano Vieira Signed-off-by: Greg Kroah-Hartman --- drivers/staging/crystalhd/bc_dts_glob_lnx.h | 3 +-- drivers/staging/crystalhd/crystalhd_cmds.c | 3 +-- drivers/staging/crystalhd/crystalhd_cmds.h | 4 ++-- drivers/staging/crystalhd/crystalhd_hw.c | 3 ++- drivers/staging/crystalhd/crystalhd_hw.h | 3 +-- drivers/staging/crystalhd/crystalhd_lnx.c | 3 ++- drivers/staging/crystalhd/crystalhd_lnx.h | 5 ++--- drivers/staging/crystalhd/crystalhd_misc.c | 5 ++--- drivers/staging/crystalhd/crystalhd_misc.h | 4 ++-- 9 files changed, 15 insertions(+), 18 deletions(-) (limited to 'drivers/staging/crystalhd') diff --git a/drivers/staging/crystalhd/bc_dts_glob_lnx.h b/drivers/staging/crystalhd/bc_dts_glob_lnx.h index bbe5119761f..fd1a6e680c8 100644 --- a/drivers/staging/crystalhd/bc_dts_glob_lnx.h +++ b/drivers/staging/crystalhd/bc_dts_glob_lnx.h @@ -48,8 +48,7 @@ #endif -#include "bc_dts_defs.h" -#include "bcm_70012_regs.h" /* Link Register defs */ +#include "crystalhd.h" #define CRYSTALHD_API_NAME "crystalhd" #define CRYSTALHD_API_DEV_NAME "/dev/crystalhd" diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c index 3735ed3da4c..05fe78748df 100644 --- a/drivers/staging/crystalhd/crystalhd_cmds.c +++ b/drivers/staging/crystalhd/crystalhd_cmds.c @@ -24,8 +24,7 @@ * along with this driver. If not, see . **********************************************************************/ -#include "crystalhd_cmds.h" -#include "crystalhd_hw.h" +#include "crystalhd.h" static struct crystalhd_user *bc_cproc_get_uid(struct crystalhd_cmd *ctx) { diff --git a/drivers/staging/crystalhd/crystalhd_cmds.h b/drivers/staging/crystalhd/crystalhd_cmds.h index f0a2796045c..4066ba393a1 100644 --- a/drivers/staging/crystalhd/crystalhd_cmds.h +++ b/drivers/staging/crystalhd/crystalhd_cmds.h @@ -33,8 +33,8 @@ * from _dts_glob and dts_defs etc.. which are defined for * windows. */ -#include "crystalhd_misc.h" -#include "crystalhd_hw.h" + +#include "crystalhd.h" enum crystalhd_state { BC_LINK_INVALID = 0x00, diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c index 2d02ed2c77a..88b538bfe7e 100644 --- a/drivers/staging/crystalhd/crystalhd_hw.c +++ b/drivers/staging/crystalhd/crystalhd_hw.c @@ -22,10 +22,11 @@ * along with this driver. If not, see . **********************************************************************/ +#include "crystalhd.h" + #include #include #include -#include "crystalhd_hw.h" /* Functions internal to this file */ diff --git a/drivers/staging/crystalhd/crystalhd_hw.h b/drivers/staging/crystalhd/crystalhd_hw.h index 3efbf9d4ff5..2d0e6c6005e 100644 --- a/drivers/staging/crystalhd/crystalhd_hw.h +++ b/drivers/staging/crystalhd/crystalhd_hw.h @@ -27,8 +27,7 @@ #ifndef _CRYSTALHD_HW_H_ #define _CRYSTALHD_HW_H_ -#include "crystalhd_misc.h" -#include "crystalhd_fw_if.h" +#include "crystalhd.h" /* HW constants..*/ #define DMA_ENGINE_CNT 2 diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 9dca92c9557..d9e3d618f7f 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -15,10 +15,11 @@ along with this driver. If not, see . ***************************************************************************/ +#include "crystalhd.h" + #include #include -#include "crystalhd_lnx.h" static DEFINE_MUTEX(chd_dec_mutex); static struct class *crystalhd_class; diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h index a2b5a56be6d..a81f9298b0a 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.h +++ b/drivers/staging/crystalhd/crystalhd_lnx.h @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (c) 2005-2009, Broadcom Corporation. * - * Name: crystalhd_lnx . c + * Name: crystalhd_lnx . h * * Description: * BCM70012 Linux driver @@ -48,11 +48,10 @@ #include #include -#include "crystalhd_cmds.h" +#include "crystalhd.h" #define CRYSTAL_HD_NAME "Broadcom Crystal HD Decoder (BCM70012) Driver" - /* OS specific PCI information structure and adapter information. */ struct crystalhd_adp { /* Hardware borad/PCI specifics */ diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c index 5fa0c6e10ce..b3a637814a1 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.c +++ b/drivers/staging/crystalhd/crystalhd_misc.c @@ -24,10 +24,9 @@ * along with this driver. If not, see . **********************************************************************/ -#include +#include "crystalhd.h" -#include "crystalhd_misc.h" -#include "crystalhd_lnx.h" +#include uint32_t g_linklog_level; diff --git a/drivers/staging/crystalhd/crystalhd_misc.h b/drivers/staging/crystalhd/crystalhd_misc.h index d2f7256146e..84c87938a83 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.h +++ b/drivers/staging/crystalhd/crystalhd_misc.h @@ -28,6 +28,8 @@ #ifndef _CRYSTALHD_MISC_H_ #define _CRYSTALHD_MISC_H_ +#include "crystalhd.h" + #include #include #include @@ -35,8 +37,6 @@ #include #include #include -#include -#include "bc_dts_glob_lnx.h" /* Global log level variable defined in crystal_misc.c file */ extern uint32_t g_linklog_level; -- cgit v1.2.3