Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <jorgyano@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jorgyano Vieira and committed by
Greg Kroah-Hartman
01c32070 4768f3f0

+15 -18
+1 -2
drivers/staging/crystalhd/bc_dts_glob_lnx.h
··· 48 48 49 49 #endif 50 50 51 - #include "bc_dts_defs.h" 52 - #include "bcm_70012_regs.h" /* Link Register defs */ 51 + #include "crystalhd.h" 53 52 54 53 #define CRYSTALHD_API_NAME "crystalhd" 55 54 #define CRYSTALHD_API_DEV_NAME "/dev/crystalhd"
+1 -2
drivers/staging/crystalhd/crystalhd_cmds.c
··· 24 24 * along with this driver. If not, see <http://www.gnu.org/licenses/>. 25 25 **********************************************************************/ 26 26 27 - #include "crystalhd_cmds.h" 28 - #include "crystalhd_hw.h" 27 + #include "crystalhd.h" 29 28 30 29 static struct crystalhd_user *bc_cproc_get_uid(struct crystalhd_cmd *ctx) 31 30 {
+2 -2
drivers/staging/crystalhd/crystalhd_cmds.h
··· 33 33 * from _dts_glob and dts_defs etc.. which are defined for 34 34 * windows. 35 35 */ 36 - #include "crystalhd_misc.h" 37 - #include "crystalhd_hw.h" 36 + 37 + #include "crystalhd.h" 38 38 39 39 enum crystalhd_state { 40 40 BC_LINK_INVALID = 0x00,
+2 -1
drivers/staging/crystalhd/crystalhd_hw.c
··· 22 22 * along with this driver. If not, see <http://www.gnu.org/licenses/>. 23 23 **********************************************************************/ 24 24 25 + #include "crystalhd.h" 26 + 25 27 #include <linux/pci.h> 26 28 #include <linux/slab.h> 27 29 #include <linux/delay.h> 28 - #include "crystalhd_hw.h" 29 30 30 31 /* Functions internal to this file */ 31 32
+1 -2
drivers/staging/crystalhd/crystalhd_hw.h
··· 27 27 #ifndef _CRYSTALHD_HW_H_ 28 28 #define _CRYSTALHD_HW_H_ 29 29 30 - #include "crystalhd_misc.h" 31 - #include "crystalhd_fw_if.h" 30 + #include "crystalhd.h" 32 31 33 32 /* HW constants..*/ 34 33 #define DMA_ENGINE_CNT 2
+2 -1
drivers/staging/crystalhd/crystalhd_lnx.c
··· 15 15 along with this driver. If not, see <http://www.gnu.org/licenses/>. 16 16 ***************************************************************************/ 17 17 18 + #include "crystalhd.h" 19 + 18 20 #include <linux/mutex.h> 19 21 #include <linux/slab.h> 20 22 21 - #include "crystalhd_lnx.h" 22 23 23 24 static DEFINE_MUTEX(chd_dec_mutex); 24 25 static struct class *crystalhd_class;
+2 -3
drivers/staging/crystalhd/crystalhd_lnx.h
··· 1 1 /*************************************************************************** 2 2 * Copyright (c) 2005-2009, Broadcom Corporation. 3 3 * 4 - * Name: crystalhd_lnx . c 4 + * Name: crystalhd_lnx . h 5 5 * 6 6 * Description: 7 7 * BCM70012 Linux driver ··· 48 48 #include <asm/system.h> 49 49 #include <linux/uaccess.h> 50 50 51 - #include "crystalhd_cmds.h" 51 + #include "crystalhd.h" 52 52 53 53 #define CRYSTAL_HD_NAME "Broadcom Crystal HD Decoder (BCM70012) Driver" 54 - 55 54 56 55 /* OS specific PCI information structure and adapter information. */ 57 56 struct crystalhd_adp {
+2 -3
drivers/staging/crystalhd/crystalhd_misc.c
··· 24 24 * along with this driver. If not, see <http://www.gnu.org/licenses/>. 25 25 **********************************************************************/ 26 26 27 - #include <linux/slab.h> 27 + #include "crystalhd.h" 28 28 29 - #include "crystalhd_misc.h" 30 - #include "crystalhd_lnx.h" 29 + #include <linux/slab.h> 31 30 32 31 uint32_t g_linklog_level; 33 32
+2 -2
drivers/staging/crystalhd/crystalhd_misc.h
··· 28 28 #ifndef _CRYSTALHD_MISC_H_ 29 29 #define _CRYSTALHD_MISC_H_ 30 30 31 + #include "crystalhd.h" 32 + 31 33 #include <linux/module.h> 32 34 #include <linux/kernel.h> 33 35 #include <linux/errno.h> ··· 37 35 #include <linux/ioctl.h> 38 36 #include <linux/dma-mapping.h> 39 37 #include <linux/sched.h> 40 - #include <asm/system.h> 41 - #include "bc_dts_glob_lnx.h" 42 38 43 39 /* Global log level variable defined in crystal_misc.c file */ 44 40 extern uint32_t g_linklog_level;