diff --git a/drivers/staging/tidspbridge/Makefile b/drivers/staging/tidspbridge/Makefile index 8a139824b68ad5d0f5797881a2b2e7e3e6828d3c..8f0ca88b5ed060928f9af8f07852cb65e2857792 100644 --- a/drivers/staging/tidspbridge/Makefile +++ b/drivers/staging/tidspbridge/Makefile @@ -1,8 +1,7 @@ obj-$(CONFIG_TIDSPBRIDGE) += bridgedriver.o libgen = gen/gb.o gen/gs.o gen/gh.o gen/uuidutil.o -libservices = services/cfg.o \ - services/services.o +libservices = services/services.o libcore = core/chnl_sm.o core/msg_sm.o core/io_sm.o core/tiomap3430.o \ core/tiomap3430_pwr.o core/tiomap_io.o \ core/ue_deh.o core/wdt.o core/dsp-clock.o core/sync.o diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c index bee2b23a09a1a573ddd2c5b67e1cf455fc5075ba..662a5b5a58e3ad7c0a01fca4d8d04daa5d0b52ae 100644 --- a/drivers/staging/tidspbridge/core/chnl_sm.c +++ b/drivers/staging/tidspbridge/core/chnl_sm.c @@ -54,7 +54,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include /* ----------------------------------- Bridge Driver */ diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c index 5b1a0c5bb1436987efbd4b8942dd4c0089ac857b..46d17c777b8871ca9cd7f244a2877e130cc8335e 100644 --- a/drivers/staging/tidspbridge/core/dsp-clock.c +++ b/drivers/staging/tidspbridge/core/dsp-clock.c @@ -25,7 +25,6 @@ /* ----------------------------------- DSP/BIOS Bridge */ #include -#include #include #include #include "_tiomap.h" diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c index 02c660dbcf682ad6a30f2167426a5ff3b93f7c26..571864555ddd894c73f2649ca43996b5bf7d77a4 100644 --- a/drivers/staging/tidspbridge/core/io_sm.c +++ b/drivers/staging/tidspbridge/core/io_sm.c @@ -36,7 +36,6 @@ #include /* Services Layer */ -#include #include #include diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index f914829c70f504fba92ca002b2160c39effdcf43..f1e59e84ea381523ece97d78c51f664995de5797 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/drivers/staging/tidspbridge/core/tiomap3430.c @@ -30,7 +30,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c index b789f8fdd89bcec76713f3bc8be98c38c4610d7e..b9d07535ef71d125262678c0a75f31ec1567bced 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c +++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c @@ -16,9 +16,11 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* ----------------------------------- Host OS */ +#include + /* ----------------------------------- DSP/BIOS Bridge */ #include -#include #include #include diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c index 190c028afe9b5c2801912383a0d8765d40ea1974..e78a7cd31526acaea99800e41a6a0e999375c89e 100644 --- a/drivers/staging/tidspbridge/core/tiomap_io.c +++ b/drivers/staging/tidspbridge/core/tiomap_io.c @@ -27,7 +27,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include /* ----------------------------------- specific to this file */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfg.h b/drivers/staging/tidspbridge/include/dspbridge/cfg.h deleted file mode 100644 index 238215b0510fdec6c78670867a6aa62a7ea0456f..0000000000000000000000000000000000000000 --- a/drivers/staging/tidspbridge/include/dspbridge/cfg.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * cfg.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * PM Configuration module. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef CFG_ -#define CFG_ -#include -#include - -/* - * ======== cfg_get_cd_version ======== - * Purpose: - * Retrieves the version of the PM Class Driver. - * Parameters: - * version: Ptr to u32 to contain version number upon return. - * Returns: - * 0: Success. version contains Class Driver version in - * the form: 0xAABBCCDD where AABB is Major version and - * CCDD is Minor. - * -EPERM: Failure. - * Requires: - * CFG initialized. - * Ensures: - * 0: Success. - * else: *version is NULL. - */ -extern int cfg_get_cd_version(u32 *version); - -/* - * ======== cfg_get_perf_value ======== - * Purpose: - * Retrieve a flag indicating whether PERF should log statistics for the - * PM class driver. - * Parameters: - * enable_perf: Location to store flag. 0 indicates the key was - * not found, or had a zero value. A nonzero value - * means the key was found and had a nonzero value. - * Returns: - * Requires: - * enable_perf != NULL; - * Ensures: - */ -extern void cfg_get_perf_value(bool *enable_perf); - -/* - * ======== cfg_get_zl_file ======== - * Purpose: - * Retreive the ZLFile, if any, for this board. - * Parameters: - * dev_node_obj: Handle to the dev_node who's driver we are querying. - * buf_size: Size of buffer. - * str_zl_file_name: Ptr to character buf to hold ZLFileName. - * Returns: - * 0: Success. - * -EFAULT: str_zl_file_name is invalid or dev_node_obj is invalid. - * -ENODATA: couldn't find the ZLFileName. - * Requires: - * CFG initialized. - * Ensures: - * 0: Not more than buf_size bytes were copied into - * str_zl_file_name, and *str_zl_file_name contains ZLFileName - * for this devnode. - */ -extern int cfg_get_zl_file(struct cfg_devnode *dev_node_obj, - u32 buf_size, char *str_zl_file_name); - -#endif /* CFG_ */ diff --git a/drivers/staging/tidspbridge/pmgr/chnl.c b/drivers/staging/tidspbridge/pmgr/chnl.c index 90317b58f8eb1fb87a686dddf8fbf6703dccd5d5..78b0d0f303d720265f746530cab02ed813426f67 100644 --- a/drivers/staging/tidspbridge/pmgr/chnl.c +++ b/drivers/staging/tidspbridge/pmgr/chnl.c @@ -28,7 +28,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include /* ----------------------------------- Platform Manager */ diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c index ce3dc8822afab20a152c3d9a3504b18820ebe39b..e3f77bd453f703c0bcf351dde86af3c0589e7c87 100644 --- a/drivers/staging/tidspbridge/pmgr/cmm.c +++ b/drivers/staging/tidspbridge/pmgr/cmm.c @@ -38,7 +38,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include #include diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c index b0bcbd92ebeab9ccbb5b7d783fe5b332e55c8592..132e960967b970b75a6441cf65127de390efe973 100644 --- a/drivers/staging/tidspbridge/pmgr/dev.c +++ b/drivers/staging/tidspbridge/pmgr/dev.c @@ -27,7 +27,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c index d9bb3ea92afc843b62fa77b91ccb59b06f43c835..10a14441eec9dcdc954b9c38db7480dc9a0c2006 100644 --- a/drivers/staging/tidspbridge/pmgr/dspapi.c +++ b/drivers/staging/tidspbridge/pmgr/dspapi.c @@ -28,7 +28,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c index 7970fe55648eded1088460f750ed1ce8f50b7f14..20cbb9fe40c212c9a3351d73c3546da9a6cea32e 100644 --- a/drivers/staging/tidspbridge/pmgr/io.c +++ b/drivers/staging/tidspbridge/pmgr/io.c @@ -26,9 +26,6 @@ /* ----------------------------------- Trace & Debug */ #include -/* ----------------------------------- OS Adaptation Layer */ -#include - /* ----------------------------------- Platform Manager */ #include diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c index 519053f5895217b753f957fc5d5ec518fe498c35..81b1b90135502b52a20d002760decbcd249f3196 100644 --- a/drivers/staging/tidspbridge/rmgr/drv.c +++ b/drivers/staging/tidspbridge/rmgr/drv.c @@ -27,7 +27,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include /* ----------------------------------- This */ diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c index 3d2045418e4e75bce62ac030615d9e21e6ce31b7..ae28b96d7b658ece32d5f5b64bec9352010b2897 100644 --- a/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -54,7 +54,6 @@ /* ----------------------------------- This */ #include -#include #include #include #include diff --git a/drivers/staging/tidspbridge/rmgr/dspdrv.c b/drivers/staging/tidspbridge/rmgr/dspdrv.c index 2ad291daf82669d4cd7f189ad32bc3600bb2d731..7a6fc737872c31c2cd261562196854b573c556e0 100644 --- a/drivers/staging/tidspbridge/rmgr/dspdrv.c +++ b/drivers/staging/tidspbridge/rmgr/dspdrv.c @@ -26,9 +26,6 @@ /* ----------------------------------- Trace & Debug */ #include -/* ----------------------------------- OS Adaptation Layer */ -#include - /* ----------------------------------- Platform Manager */ #include #include diff --git a/drivers/staging/tidspbridge/rmgr/mgr.c b/drivers/staging/tidspbridge/rmgr/mgr.c index 48702bb30b3acfb21dcd9484eb3f8fe787b7648c..0ea89a1bb77c2da8f85a29f0f2012a352837afd2 100644 --- a/drivers/staging/tidspbridge/rmgr/mgr.c +++ b/drivers/staging/tidspbridge/rmgr/mgr.c @@ -20,6 +20,9 @@ #include +/* ----------------------------------- Host OS */ +#include + /* ----------------------------------- DSP/BIOS Bridge */ #include @@ -27,7 +30,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include /* ----------------------------------- Others */ diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 6e9441e21265c343fa23847849cafac6a8e3ca04..84882dc29a50d6bf225569935d46c86f9f28ad1c 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c @@ -27,7 +27,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include #include diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c index 295845bc118f6501f3c21378c8404472982b62d9..b47d7aa747b1d95181fa228d79dec9ce322aa24f 100644 --- a/drivers/staging/tidspbridge/rmgr/proc.c +++ b/drivers/staging/tidspbridge/rmgr/proc.c @@ -29,7 +29,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include #include diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c index ef2ec9497b1cc665d6b0f7ae42bf7a3d965e42d5..f4986b7cc9e56ba6df63b3c52f292433ce2aa03c 100644 --- a/drivers/staging/tidspbridge/rmgr/strm.c +++ b/drivers/staging/tidspbridge/rmgr/strm.c @@ -42,7 +42,6 @@ /* ----------------------------------- This */ #include -#include #include /* ----------------------------------- Defines, Data Structures, Typedefs */ diff --git a/drivers/staging/tidspbridge/services/cfg.c b/drivers/staging/tidspbridge/services/cfg.c deleted file mode 100644 index 32bb934ba5e3099b480b26d1d420430830110b7d..0000000000000000000000000000000000000000 --- a/drivers/staging/tidspbridge/services/cfg.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * cfg.c - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Implementation of platform specific config services. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#include - -/* ----------------------------------- DSP/BIOS Bridge */ -#include - -/* ----------------------------------- Trace & Debug */ -#include - -/* ----------------------------------- OS Adaptation Layer */ - -/* ----------------------------------- This */ -#include -#include - diff --git a/drivers/staging/tidspbridge/services/services.c b/drivers/staging/tidspbridge/services/services.c index 47bac21144b1769b0dfdecba935c547df650f626..3d0497ef0e7f7d63a632209c91b322593ae4a559 100644 --- a/drivers/staging/tidspbridge/services/services.c +++ b/drivers/staging/tidspbridge/services/services.c @@ -27,7 +27,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include #include