* [PATCH 0/5] staging:tidspbridge - Audit headers file
@ 2010-12-17 1:18 Armando Uribe
2010-12-17 1:18 ` [PATCH 1/5] staging:tidspbridge - Remove unused defined constants Armando Uribe
0 siblings, 1 reply; 7+ messages in thread
From: Armando Uribe @ 2010-12-17 1:18 UTC (permalink / raw)
To: omar.ramirez
Cc: x0095078, ohad, felipe.contreras, rene.sapiens, nm, ernesto,
devel, linux-kernel, linux-omap
The following set of patches performs a code clean up
derived from a header files audit. Removes unused macros,
constants, functions, structs, struct members, typedefs and
its dependencies.
Armando Uribe (5):
staging:tidspbridge - Remove unused defined constants
staging:tidspbridge - Remove unused functions
staging:tidspbridge - Remove unused structs.
staging:tidspbridge - Remove unused typedefs
staging:tidspbridge - Remove trivial header files
drivers/staging/tidspbridge/core/io_sm.c | 4 -
drivers/staging/tidspbridge/core/tiomap3430.c | 2 -
drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 4 +-
.../tidspbridge/include/dspbridge/brddefs.h | 2 -
.../tidspbridge/include/dspbridge/cfgdefs.h | 19 ---
.../staging/tidspbridge/include/dspbridge/chnl.h | 21 ---
.../tidspbridge/include/dspbridge/chnldefs.h | 3 -
.../tidspbridge/include/dspbridge/chnlpriv.h | 13 --
.../staging/tidspbridge/include/dspbridge/cod.h | 13 +--
.../staging/tidspbridge/include/dspbridge/dbdefs.h | 26 ----
.../tidspbridge/include/dspbridge/dbldefs.h | 141 -------------------
.../staging/tidspbridge/include/dspbridge/dbll.h | 6 -
.../tidspbridge/include/dspbridge/dblldefs.h | 65 ---------
.../tidspbridge/include/dspbridge/dehdefs.h | 32 -----
.../staging/tidspbridge/include/dspbridge/dev.h | 59 +--------
.../staging/tidspbridge/include/dspbridge/disp.h | 15 ++-
.../tidspbridge/include/dspbridge/dispdefs.h | 35 -----
.../staging/tidspbridge/include/dspbridge/drv.h | 31 +----
.../tidspbridge/include/dspbridge/drvdefs.h | 25 ----
.../tidspbridge/include/dspbridge/dspapi-ioctl.h | 8 -
.../tidspbridge/include/dspbridge/dspdefs.h | 10 +-
.../staging/tidspbridge/include/dspbridge/dspdrv.h | 2 -
.../staging/tidspbridge/include/dspbridge/dspio.h | 4 +-
.../tidspbridge/include/dspbridge/dspioctl.h | 5 -
.../tidspbridge/include/dspbridge/dynamic_loader.h | 2 -
.../tidspbridge/include/dspbridge/host_os.h | 9 --
drivers/staging/tidspbridge/include/dspbridge/io.h | 29 ++---
.../staging/tidspbridge/include/dspbridge/io_sm.h | 143 +-------------------
.../staging/tidspbridge/include/dspbridge/iodefs.h | 36 -----
.../staging/tidspbridge/include/dspbridge/ldr.h | 29 ----
.../staging/tidspbridge/include/dspbridge/mbx_sh.h | 40 ------
.../staging/tidspbridge/include/dspbridge/node.h | 20 +---
.../staging/tidspbridge/include/dspbridge/pwr.h | 8 +-
.../staging/tidspbridge/include/dspbridge/pwr_sh.h | 33 -----
.../include/dspbridge/resourcecleanup.h | 11 --
.../staging/tidspbridge/include/dspbridge/rms_sh.h | 9 --
.../staging/tidspbridge/include/dspbridge/strm.h | 62 ---------
.../tidspbridge/include/dspbridge/strmdefs.h | 2 -
drivers/staging/tidspbridge/pmgr/cod.c | 14 +--
drivers/staging/tidspbridge/pmgr/dbll.c | 41 ------
drivers/staging/tidspbridge/pmgr/dev.c | 10 +-
drivers/staging/tidspbridge/pmgr/io.c | 1 -
drivers/staging/tidspbridge/rmgr/dbdcd.c | 2 +-
drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 -
drivers/staging/tidspbridge/rmgr/nldr.c | 3 -
drivers/staging/tidspbridge/rmgr/node.c | 1 -
46 files changed, 55 insertions(+), 996 deletions(-)
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dispdefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/drvdefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/iodefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/ldr.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/5] staging:tidspbridge - Remove unused defined constants
2010-12-17 1:18 [PATCH 0/5] staging:tidspbridge - Audit headers file Armando Uribe
@ 2010-12-17 1:18 ` Armando Uribe
2010-12-17 1:18 ` [PATCH 2/5] staging:tidspbridge - Remove unused functions Armando Uribe
2010-12-24 7:39 ` [PATCH 1/5] staging:tidspbridge - Remove unused defined constants Ramirez Luna, Omar
0 siblings, 2 replies; 7+ messages in thread
From: Armando Uribe @ 2010-12-17 1:18 UTC (permalink / raw)
To: omar.ramirez
Cc: x0095078, ohad, felipe.contreras, rene.sapiens, nm, ernesto,
devel, linux-kernel, linux-omap
Remove defined constants not being used.
Signed-off-by: Armando Uribe <x0095078@ti.com>
---
.../tidspbridge/include/dspbridge/brddefs.h | 2 -
.../tidspbridge/include/dspbridge/cfgdefs.h | 13 ------
.../tidspbridge/include/dspbridge/chnldefs.h | 3 -
.../tidspbridge/include/dspbridge/chnlpriv.h | 13 ------
.../staging/tidspbridge/include/dspbridge/cod.h | 3 -
.../staging/tidspbridge/include/dspbridge/dbdefs.h | 26 -------------
.../tidspbridge/include/dspbridge/dbldefs.h | 11 -----
.../tidspbridge/include/dspbridge/dehdefs.h | 1 -
.../staging/tidspbridge/include/dspbridge/drv.h | 15 -------
.../tidspbridge/include/dspbridge/dspdefs.h | 6 ---
.../staging/tidspbridge/include/dspbridge/dspdrv.h | 2 -
.../tidspbridge/include/dspbridge/dspioctl.h | 5 --
.../tidspbridge/include/dspbridge/dynamic_loader.h | 2 -
.../staging/tidspbridge/include/dspbridge/io_sm.h | 1 -
.../staging/tidspbridge/include/dspbridge/iodefs.h | 2 -
.../staging/tidspbridge/include/dspbridge/mbx_sh.h | 40 --------------------
.../staging/tidspbridge/include/dspbridge/pwr_sh.h | 4 --
.../staging/tidspbridge/include/dspbridge/rms_sh.h | 9 ----
.../tidspbridge/include/dspbridge/strmdefs.h | 2 -
drivers/staging/tidspbridge/pmgr/dev.c | 2 +-
20 files changed, 1 insertions(+), 161 deletions(-)
diff --git a/drivers/staging/tidspbridge/include/dspbridge/brddefs.h b/drivers/staging/tidspbridge/include/dspbridge/brddefs.h
index f80d9a5..725d7b3 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/brddefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/brddefs.h
@@ -24,9 +24,7 @@
#define BRD_IDLE 0x1 /* Monitor Loaded, but suspended. */
#define BRD_RUNNING 0x2 /* Monitor loaded, and executing. */
#define BRD_UNKNOWN 0x3 /* Board state is indeterminate. */
-#define BRD_SYNCINIT 0x4
#define BRD_LOADED 0x5
-#define BRD_LASTSTATE BRD_LOADED /* Set to highest legal board state. */
#define BRD_SLEEP_TRANSITION 0x6 /* Sleep transition in progress */
#define BRD_HIBERNATION 0x7 /* MPU initiated hibernation */
#define BRD_RETENTION 0x8 /* Retention mode */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
index f403c01..c3f04f8 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
@@ -19,25 +19,12 @@
#ifndef CFGDEFS_
#define CFGDEFS_
-/* Maximum length of module search path. */
-#define CFG_MAXSEARCHPATHLEN 255
-
-/* Maximum length of general paths. */
-#define CFG_MAXPATH 255
-
/* Host Resources: */
#define CFG_MAXMEMREGISTERS 9
-#define CFG_MAXIOPORTS 20
-#define CFG_MAXIRQS 7
-#define CFG_MAXDMACHANNELS 7
/* IRQ flag */
#define CFG_IRQSHARED 0x01 /* IRQ can be shared */
-/* DSP Resources: */
-#define CFG_DSPMAXMEMTYPES 10
-#define CFG_DEFAULT_NUM_WINDOWS 1 /* We support only one window. */
-
/* A platform-related device handle: */
struct cfg_devnode;
diff --git a/drivers/staging/tidspbridge/include/dspbridge/chnldefs.h b/drivers/staging/tidspbridge/include/dspbridge/chnldefs.h
index 5bf5f6b..8f8f9ec 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/chnldefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/chnldefs.h
@@ -22,9 +22,6 @@
/* Channel id option. */
#define CHNL_PICKFREE (~0UL) /* Let manager pick a free channel. */
-/* Channel manager limits: */
-#define CHNL_INITIOREQS 4 /* Default # of I/O requests. */
-
/* Channel modes */
#define CHNL_MODETODSP 0 /* Data streaming to the DSP. */
#define CHNL_MODEFROMDSP 1 /* Data streaming from the DSP. */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h b/drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h
index 9292100..1785c3e 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h
@@ -39,12 +39,6 @@
*/
#define CHNL_PCPY 0 /* Proc-copy transport 0 */
-#define CHNL_MAXIRQ 0xff /* Arbitrarily large number. */
-
-/* The following modes are private: */
-#define CHNL_MODEUSEREVENT 0x1000 /* User provided the channel event. */
-#define CHNL_MODEMASK 0x1001
-
/* Higher level channel states: */
#define CHNL_STATEREADY 0 /* Channel ready for I/O. */
#define CHNL_STATECANCEL 1 /* I/O was cancelled. */
@@ -56,13 +50,6 @@
/* Types of channel class libraries: */
#define CHNL_TYPESM 1 /* Shared memory driver. */
-#define CHNL_TYPEBM 2 /* Bus Mastering driver. */
-
-/* Max string length of channel I/O completion event name - change if needed */
-#define CHNL_MAXEVTNAMELEN 32
-
-/* Max memory pages lockable in CHNL_PrepareBuffer() - change if needed */
-#define CHNL_MAXLOCKPAGES 64
/* Channel info. */
struct chnl_info {
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index 42bce2e..5efea91 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -27,9 +27,6 @@
#define COD_TRACEBEG "SYS_PUTCBEG"
#define COD_TRACEEND "SYS_PUTCEND"
#define COD_TRACECURPOS "BRIDGE_SYS_PUTC_current"
-#define COD_TRACESECT "trace"
-#define COD_TRACEBEGOLD "PUTCBEG"
-#define COD_TRACEENDOLD "PUTCEND"
#define COD_NOLOAD DBLL_NOLOAD
#define COD_SYMB DBLL_SYMB
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
index 5af075d..38fffeb 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
@@ -31,9 +31,6 @@
/* API return value and calling convention */
#define DBAPI int
-/* Infinite time value for the utimeout parameter to DSPStream_Select() */
-#define DSP_FOREVER (-1)
-
/* Maximum length of node name, used in dsp_ndbprops */
#define DSP_MAXNAMELEN 32
@@ -74,16 +71,9 @@
#define DSP_NODE_MIN_PRIORITY 1
#define DSP_NODE_MAX_PRIORITY 15
-/* Pre-Defined Message Command Codes available to user: */
-#define DSP_RMSUSERCODESTART RMS_USER /* Start of RMS user cmd codes */
-/* end of user codes */
-#define DSP_RMSUSERCODEEND (RMS_USER + RMS_MAXUSERCODES);
/* msg_ctrl contains SM buffer description */
#define DSP_RMSBUFDESC RMS_BUFDESC
-/* Shared memory identifier for MEM segment named "SHMSEG0" */
-#define DSP_SHMSEG0 (u32)(-1)
-
/* Processor ID numbers */
#define DSP_UNIT 0
#define IVA_UNIT 1
@@ -91,15 +81,6 @@
#define DSPWORD unsigned char
#define DSPWORDSIZE sizeof(DSPWORD)
-/* Power control enumerations */
-#define PROC_PWRCONTROL 0x8070
-
-#define PROC_PWRMGT_ENABLE (PROC_PWRCONTROL + 0x3)
-#define PROC_PWRMGT_DISABLE (PROC_PWRCONTROL + 0x4)
-
-/* Bridge Code Version */
-#define BRIDGE_VERSION_CODE 333
-
#define MAX_PROFILES 16
/* DSP chip type */
@@ -501,13 +482,6 @@ bit 15 - Output (writeable) buffer
#define DSPPROCTYPE_C64 6410
#define IVAPROCTYPE_ARM7 470
-#define REG_MGR_OBJECT 1
-#define REG_DRV_OBJECT 2
-
-/* registry */
-#define DRVOBJECT "DrvObject"
-#define MGROBJECT "MgrObject"
-
/* Max registry path length. Also the max registry value length. */
#define MAXREGPATHLENGTH 255
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
index bf4fb99..9973098 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
@@ -17,17 +17,6 @@
#ifndef DBLDEFS_
#define DBLDEFS_
-/*
- * Bit masks for dbl_flags.
- */
-#define DBL_NOLOAD 0x0 /* Don't load symbols, code, or data */
-#define DBL_SYMB 0x1 /* load symbols */
-#define DBL_CODE 0x2 /* load code */
-#define DBL_DATA 0x4 /* load data */
-#define DBL_DYNAMIC 0x8 /* dynamic load */
-#define DBL_BSS 0x20 /* Unitialized section */
-
-#define DBL_MAXPATHLENGTH 255
/*
* ======== dbl_flags ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dehdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
index 09f8bf8..5341471 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
@@ -26,7 +26,6 @@ struct deh_mgr;
/* Magic code used to determine if DSP signaled exception. */
#define DEH_BASE MBX_DEH_BASE
-#define DEH_USERS_BASE MBX_DEH_USERS_BASE
#define DEH_LIMIT MBX_DEH_LIMIT
#endif /* _DEHDEFS_H */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h
index 37f5a45..adb28ec 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
@@ -26,9 +26,6 @@
#include <dspbridge/drvdefs.h>
#include <linux/idr.h>
-#define DRV_ASSIGN 1
-#define DRV_RELEASE 0
-
/* Provide the DSP Internal memory windows that can be accessed from L3 address
* space */
@@ -38,23 +35,14 @@
/* MEM1 is L2 RAM + L2 Cache space */
#define OMAP_DSP_MEM1_BASE 0x5C7F8000
#define OMAP_DSP_MEM1_SIZE 0x18000
-#define OMAP_DSP_GEM1_BASE 0x107F8000
/* MEM2 is L1P RAM/CACHE space */
#define OMAP_DSP_MEM2_BASE 0x5CE00000
#define OMAP_DSP_MEM2_SIZE 0x8000
-#define OMAP_DSP_GEM2_BASE 0x10E00000
/* MEM3 is L1D RAM/CACHE space */
#define OMAP_DSP_MEM3_BASE 0x5CF04000
#define OMAP_DSP_MEM3_SIZE 0x14000
-#define OMAP_DSP_GEM3_BASE 0x10F04000
-
-#define OMAP_IVA2_PRM_BASE 0x48306000
-#define OMAP_IVA2_PRM_SIZE 0x1000
-
-#define OMAP_IVA2_CM_BASE 0x48004000
-#define OMAP_IVA2_CM_SIZE 0x1000
#define OMAP_PER_CM_BASE 0x48005000
#define OMAP_PER_CM_SIZE 0x1000
@@ -68,9 +56,6 @@
#define OMAP_DMMU_BASE 0x5D000000
#define OMAP_DMMU_SIZE 0x1000
-#define OMAP_PRCM_VDD1_DOMAIN 1
-#define OMAP_PRCM_VDD2_DOMAIN 2
-
/* GPP PROCESS CLEANUP Data structures */
/* New structure (member of process context) abstracts NODE resource info */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index 0ae7d16..2acbbb3 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -37,12 +37,6 @@
#include <dspbridge/iodefs.h>
#include <dspbridge/msgdefs.h>
-/*
- * Any IOCTLS at or above this value are reserved for standard Bridge driver
- * interfaces.
- */
-#define BRD_RESERVEDIOCTLBASE 0x8000
-
/* Handle to Bridge driver's private device context. */
struct bridge_dev_context;
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h b/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
index 0bb250f..7adf1e7 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
@@ -20,8 +20,6 @@
#if !defined _DSPDRV_H_
#define _DSPDRV_H_
-#define MAX_DEV 10 /* Max support of 10 devices */
-
/*
* ======== dsp_deinit ========
* Purpose:
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspioctl.h b/drivers/staging/tidspbridge/include/dspbridge/dspioctl.h
index 41e0594..54552a7 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspioctl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspioctl.h
@@ -31,9 +31,6 @@
#define BRDIOCTL_CHNLREAD (BRDIOCTL_RESERVEDBASE + 0x10)
#define BRDIOCTL_CHNLWRITE (BRDIOCTL_RESERVEDBASE + 0x20)
-#define BRDIOCTL_GETINTRCOUNT (BRDIOCTL_RESERVEDBASE + 0x30)
-#define BRDIOCTL_RESETINTRCOUNT (BRDIOCTL_RESERVEDBASE + 0x40)
-#define BRDIOCTL_INTERRUPTDSP (BRDIOCTL_RESERVEDBASE + 0x50)
/* DMMU */
#define BRDIOCTL_SETMMUCONFIG (BRDIOCTL_RESERVEDBASE + 0x60)
/* PWR */
@@ -47,8 +44,6 @@
#define BRDIOCTL_DEEPSLEEP (BRDIOCTL_PWRCONTROL + 0x0)
#define BRDIOCTL_EMERGENCYSLEEP (BRDIOCTL_PWRCONTROL + 0x1)
#define BRDIOCTL_WAKEUP (BRDIOCTL_PWRCONTROL + 0x2)
-#define BRDIOCTL_PWRENABLE (BRDIOCTL_PWRCONTROL + 0x3)
-#define BRDIOCTL_PWRDISABLE (BRDIOCTL_PWRCONTROL + 0x4)
#define BRDIOCTL_CLK_CTRL (BRDIOCTL_PWRCONTROL + 0x7)
/* DSP Initiated Hibernate */
#define BRDIOCTL_PWR_HIBERNATE (BRDIOCTL_PWRCONTROL + 0x8)
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h b/drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h
index 4b109d1..052d27e 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h
@@ -46,8 +46,6 @@ struct dynamic_loader_initialize;
* Option flags to modify the behavior of module loading
*/
#define DLOAD_INITBSS 0x1 /* initialize BSS sections to zero */
-#define DLOAD_BIGEND 0x2 /* require big-endian load module */
-#define DLOAD_LITTLE 0x4 /* require little-endian load module */
/*****************************************************************************
* Procedure dynamic_load_module
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
index 18aec55..bcde1d9 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
@@ -28,7 +28,6 @@
#define IO_INPUT 0
#define IO_OUTPUT 1
#define IO_SERVICE 2
-#define IO_MAXSERVICE IO_SERVICE
#ifdef CONFIG_TIDSPBRIDGE_DVFS
/* The maximum number of OPPs that are supported */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/iodefs.h b/drivers/staging/tidspbridge/include/dspbridge/iodefs.h
index 8bd10a0..31cbc9a 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/iodefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/iodefs.h
@@ -19,8 +19,6 @@
#ifndef IODEFS_
#define IODEFS_
-#define IO_MAXIRQ 0xff /* Arbitrarily large number. */
-
/* IO Objects: */
struct io_mgr;
diff --git a/drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h b/drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h
index 5d165cd..7424c88 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h
@@ -110,13 +110,7 @@
#ifndef _MBX_SH_H
#define _MBX_SH_H
-#define MBX_CLASS_MSK 0xFC00 /* Class bits are 10 thru 15 */
-#define MBX_VALUE_MSK 0x03FF /* Value is 0 thru 9 */
-
-#define MBX_DEH_CLASS 0x0000 /* DEH owns Mbx INTR */
-#define MBX_DDMA_CLASS 0x0400 /* DSP-DMA link drvr chnls owns INTR */
#define MBX_PCPY_CLASS 0x0800 /* PROC-COPY " */
-#define MBX_ZCPY_CLASS 0x1000 /* ZERO-COPY " */
#define MBX_PM_CLASS 0x2000 /* Power Management */
#define MBX_DBG_CLASS 0x4000 /* For debugging purpose */
@@ -128,55 +122,21 @@
#define MBX_DEH_USERS_BASE 0x100 /* 256 */
#define MBX_DEH_LIMIT 0x3FF /* 1023 */
#define MBX_DEH_RESET 0x101 /* DSP RESET (DEH) */
-#define MBX_DEH_EMMU 0X103 /*DSP MMU FAULT RECOVERY */
/*
* Link driver command/status codes.
*/
-/* DSP-DMA */
-#define MBX_DDMA_NUMCHNLBITS 5 /* # chnl Id: # bits available */
-#define MBX_DDMA_CHNLSHIFT 0 /* # of bits to shift */
-#define MBX_DDMA_CHNLMSK 0x01F /* bits 0 thru 4 */
-
-#define MBX_DDMA_NUMBUFBITS 5 /* buffer index: # of bits avail */
-#define MBX_DDMA_BUFSHIFT (MBX_DDMA_NUMCHNLBITS + MBX_DDMA_CHNLSHIFT)
-#define MBX_DDMA_BUFMSK 0x3E0 /* bits 5 thru 9 */
-
-/* Zero-Copy */
-#define MBX_ZCPY_NUMCHNLBITS 5 /* # chnl Id: # bits available */
-#define MBX_ZCPY_CHNLSHIFT 0 /* # of bits to shift */
-#define MBX_ZCPY_CHNLMSK 0x01F /* bits 0 thru 4 */
/* Power Management Commands */
#define MBX_PM_DSPIDLE (MBX_PM_CLASS + 0x0)
#define MBX_PM_DSPWAKEUP (MBX_PM_CLASS + 0x1)
#define MBX_PM_EMERGENCYSLEEP (MBX_PM_CLASS + 0x2)
-#define MBX_PM_SLEEPUNTILRESTART (MBX_PM_CLASS + 0x3)
-#define MBX_PM_DSPGLOBALIDLE_OFF (MBX_PM_CLASS + 0x4)
-#define MBX_PM_DSPGLOBALIDLE_ON (MBX_PM_CLASS + 0x5)
#define MBX_PM_SETPOINT_PRENOTIFY (MBX_PM_CLASS + 0x6)
#define MBX_PM_SETPOINT_POSTNOTIFY (MBX_PM_CLASS + 0x7)
-#define MBX_PM_DSPRETN (MBX_PM_CLASS + 0x8)
#define MBX_PM_DSPRETENTION (MBX_PM_CLASS + 0x8)
#define MBX_PM_DSPHIBERNATE (MBX_PM_CLASS + 0x9)
#define MBX_PM_HIBERNATE_EN (MBX_PM_CLASS + 0xA)
#define MBX_PM_OPP_REQ (MBX_PM_CLASS + 0xB)
-#define MBX_PM_OPP_CHG (MBX_PM_CLASS + 0xC)
-
-#define MBX_PM_TYPE_MASK 0x0300
-#define MBX_PM_TYPE_PWR_CHNG 0x0100
-#define MBX_PM_TYPE_OPP_PRECHNG 0x0200
-#define MBX_PM_TYPE_OPP_POSTCHNG 0x0300
-#define MBX_PM_TYPE_OPP_MASK 0x0300
-#define MBX_PM_OPP_PRECHNG (MBX_PM_CLASS | MBX_PM_TYPE_OPP_PRECHNG)
-/* DSP to MPU */
-#define MBX_PM_OPP_CHNG(OPP) (MBX_PM_CLASS | MBX_PM_TYPE_OPP_PRECHNG | (OPP))
-#define MBX_PM_RET (MBX_PM_CLASS | MBX_PM_TYPE_PWR_CHNG | 0x0006)
-#define MBX_PM_HIB (MBX_PM_CLASS | MBX_PM_TYPE_PWR_CHNG | 0x0002)
-#define MBX_PM_OPP1 0
-#define MBX_PM_OPP2 1
-#define MBX_PM_OPP3 2
-#define MBX_PM_OPP4 3
/* Bridge Debug Commands */
#define MBX_DBG_SYSPRINTF (MBX_DBG_CLASS + 0x0)
diff --git a/drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h b/drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
index 1b4a090..c78a1b1 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
@@ -24,10 +24,6 @@
/* valid sleep command codes that can be sent by GPP via mailbox: */
#define PWR_DEEPSLEEP MBX_PM_DSPIDLE
#define PWR_EMERGENCYDEEPSLEEP MBX_PM_EMERGENCYSLEEP
-#define PWR_SLEEPUNTILRESTART MBX_PM_SLEEPUNTILRESTART
#define PWR_WAKEUP MBX_PM_DSPWAKEUP
-#define PWR_AUTOENABLE MBX_PM_PWRENABLE
-#define PWR_AUTODISABLE MBX_PM_PWRDISABLE
-#define PWR_RETENTION MBX_PM_DSPRETN
#endif /* PWR_SH_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/rms_sh.h b/drivers/staging/tidspbridge/include/dspbridge/rms_sh.h
index 7bc5574..ba7f478 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/rms_sh.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/rms_sh.h
@@ -22,27 +22,18 @@
#include <dspbridge/rmstypes.h>
-/* Node Types: */
-#define RMS_TASK 1 /* Task node */
-#define RMS_DAIS 2 /* xDAIS socket node */
-#define RMS_MSG 3 /* Message node */
-
/* Memory Types: */
#define RMS_CODE 0 /* Program space */
#define RMS_DATA 1 /* Data space */
-#define RMS_IO 2 /* I/O space */
/* RM Server Command and Response Buffer Sizes: */
#define RMS_COMMANDBUFSIZE 256 /* Size of command buffer */
-#define RMS_RESPONSEBUFSIZE 16 /* Size of response buffer */
/* Pre-Defined Command/Response Codes: */
#define RMS_EXIT 0x80000000 /* GPP->Node: shutdown */
#define RMS_EXITACK 0x40000000 /* Node->GPP: ack shutdown */
#define RMS_BUFDESC 0x20000000 /* Arg1 SM buf, Arg2 SM size */
#define RMS_KILLTASK 0x10000000 /* GPP->Node: Kill Task */
-#define RMS_USER 0x0 /* Start of user-defined msg codes */
-#define RMS_MAXUSERCODES 0xfff /* Maximum user defined C/R Codes */
/* RM Server RPC Command Structure: */
struct rms_command {
diff --git a/drivers/staging/tidspbridge/include/dspbridge/strmdefs.h b/drivers/staging/tidspbridge/include/dspbridge/strmdefs.h
index b363f79..c6abbf3 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/strmdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/strmdefs.h
@@ -19,8 +19,6 @@
#ifndef STRMDEFS_
#define STRMDEFS_
-#define STRM_MAXEVTNAMELEN 32
-
struct strm_mgr;
struct strm_object;
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index b160b00..b95cd20 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -880,7 +880,7 @@ int dev_start_device(struct cfg_devnode *dev_node_obj)
{
struct dev_object *hdev_obj = NULL; /* handle to 'Bridge Device */
/* Bridge driver filename */
- char bridge_file_name[CFG_MAXSEARCHPATHLEN] = "UMA";
+ char *bridge_file_name = "UMA";
int status;
struct mgr_object *hmgr_obj = NULL;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
--
1.6.3.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/5] staging:tidspbridge - Remove unused functions
2010-12-17 1:18 ` [PATCH 1/5] staging:tidspbridge - Remove unused defined constants Armando Uribe
@ 2010-12-17 1:18 ` Armando Uribe
2010-12-17 1:18 ` [PATCH 3/5] staging:tidspbridge - Remove unused structs Armando Uribe
2010-12-24 7:39 ` [PATCH 1/5] staging:tidspbridge - Remove unused defined constants Ramirez Luna, Omar
1 sibling, 1 reply; 7+ messages in thread
From: Armando Uribe @ 2010-12-17 1:18 UTC (permalink / raw)
To: omar.ramirez
Cc: x0095078, ohad, felipe.contreras, rene.sapiens, nm, ernesto,
devel, linux-kernel, linux-omap
Remove functions that are not used at all, also remove the dependencies
of this functions like struct members, comments and calls.
Signed-off-by: Armando Uribe <x0095078@ti.com>
---
drivers/staging/tidspbridge/core/io_sm.c | 4 -
drivers/staging/tidspbridge/core/tiomap3430.c | 2 -
.../staging/tidspbridge/include/dspbridge/chnl.h | 21 ---
.../staging/tidspbridge/include/dspbridge/dbll.h | 6 -
.../tidspbridge/include/dspbridge/dblldefs.h | 3 -
.../staging/tidspbridge/include/dspbridge/dev.h | 55 --------
.../staging/tidspbridge/include/dspbridge/dspio.h | 1 -
.../tidspbridge/include/dspbridge/host_os.h | 9 --
drivers/staging/tidspbridge/include/dspbridge/io.h | 16 ---
.../staging/tidspbridge/include/dspbridge/io_sm.h | 135 --------------------
.../staging/tidspbridge/include/dspbridge/node.h | 18 ---
.../include/dspbridge/resourcecleanup.h | 11 --
.../staging/tidspbridge/include/dspbridge/strm.h | 62 ---------
drivers/staging/tidspbridge/pmgr/cod.c | 3 -
drivers/staging/tidspbridge/pmgr/dbll.c | 41 ------
drivers/staging/tidspbridge/rmgr/nldr.c | 3 -
16 files changed, 0 insertions(+), 390 deletions(-)
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c
index 9289522..90e89ee 100644
--- a/drivers/staging/tidspbridge/core/io_sm.c
+++ b/drivers/staging/tidspbridge/core/io_sm.c
@@ -1682,10 +1682,6 @@ int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
return 0;
}
-void io_sm_init(void)
-{
- /* Do nothing */
-}
#if defined(CONFIG_TIDSPBRIDGE_BACKTRACE) || defined(CONFIG_TIDSPBRIDGE_DEBUG)
void print_dsp_debug_trace(struct io_mgr *hio_mgr)
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index cb45e93..cacd30e 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -255,8 +255,6 @@ void bridge_drv_entry(struct bridge_drv_interface **drv_intf,
DBC_REQUIRE(driver_file_name != NULL);
- io_sm_init(); /* Initialization of io_sm module */
-
if (strcmp(driver_file_name, "UMA") == 0)
*drv_intf = &drv_interface_fxns;
else
diff --git a/drivers/staging/tidspbridge/include/dspbridge/chnl.h b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
index 8733b3b..92f6a13 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/chnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
@@ -25,27 +25,6 @@
#include <dspbridge/chnlpriv.h>
/*
- * ======== chnl_close ========
- * Purpose:
- * Ensures all pending I/O on this channel is cancelled, discards all
- * queued I/O completion notifications, then frees the resources allocated
- * for this channel, and makes the corresponding logical channel id
- * available for subsequent use.
- * Parameters:
- * chnl_obj: Channel object handle.
- * Returns:
- * 0: Success;
- * -EFAULT: Invalid chnl_obj.
- * Requires:
- * chnl_init(void) called.
- * No thread must be blocked on this channel's I/O completion event.
- * Ensures:
- * 0: The I/O completion event for this channel is freed.
- * chnl_obj is no longer valid.
- */
-extern int chnl_close(struct chnl_object *chnl_obj);
-
-/*
* ======== chnl_create ========
* Purpose:
* Create a channel manager object, responsible for opening new channels
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbll.h b/drivers/staging/tidspbridge/include/dspbridge/dbll.h
index b018676..46a9e00 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbll.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbll.h
@@ -42,18 +42,12 @@ extern bool dbll_init(void);
extern int dbll_load(struct dbll_library_obj *lib,
dbll_flags flags,
struct dbll_attrs *attrs, u32 * entry);
-extern int dbll_load_sect(struct dbll_library_obj *zl_lib,
- char *sec_name, struct dbll_attrs *attrs);
extern int dbll_open(struct dbll_tar_obj *target, char *file,
dbll_flags flags,
struct dbll_library_obj **lib_obj);
extern int dbll_read_sect(struct dbll_library_obj *lib,
char *name, char *buf, u32 size);
-extern void dbll_set_attrs(struct dbll_tar_obj *target,
- struct dbll_attrs *pattrs);
extern void dbll_unload(struct dbll_library_obj *lib, struct dbll_attrs *attrs);
-extern int dbll_unload_sect(struct dbll_library_obj *lib,
- char *sect_name, struct dbll_attrs *attrs);
#ifdef CONFIG_TIDSPBRIDGE_BACKTRACE
bool dbll_find_dsp_symbol(struct dbll_library_obj *zl_lib, u32 address,
u32 offset_range, u32 *sym_addr_output, char *name_output);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h b/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
index d2b4fda..81821e5 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
@@ -485,12 +485,9 @@ struct dbll_fxns {
dbll_get_sect_fxn get_sect_fxn;
dbll_init_fxn init_fxn;
dbll_load_fxn load_fxn;
- dbll_load_sect_fxn load_sect_fxn;
dbll_open_fxn open_fxn;
dbll_read_sect_fxn read_sect_fxn;
- dbll_set_attrs_fxn set_attrs_fxn;
dbll_unload_fxn unload_fxn;
- dbll_unload_sect_fxn unload_sect_fxn;
};
#endif /* DBLDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index 357458f..4d4196b 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -95,43 +95,6 @@ extern int dev_create_device(struct dev_object
struct cfg_devnode *dev_node_obj);
/*
- * ======== dev_create_iva_device ========
- * Purpose:
- * Called by the operating system to load the Bridge Driver for IVA.
- * Parameters:
- * device_obj: Ptr to location to receive the device object handle.
- * driver_file_name: Name of Bridge driver PE DLL file to load. If the
- * absolute path is not provided, the file is loaded
- * through 'Bridge's module search path.
- * host_config: Host configuration information, to be passed down
- * to the Bridge driver when bridge_dev_create() is called.
- * pDspConfig: DSP resources, to be passed down to the Bridge driver
- * when bridge_dev_create() is called.
- * dev_node_obj: Platform specific device node.
- * Returns:
- * 0: Module is loaded, device object has been created
- * -ENOMEM: Insufficient memory to create needed resources.
- * -EPERM: Unable to find Bridge driver entry point function.
- * -ESPIPE: Unable to load ZL DLL.
- * Requires:
- * DEV Initialized.
- * device_obj != NULL.
- * driver_file_name != NULL.
- * host_config != NULL.
- * pDspConfig != NULL.
- * Ensures:
- * 0: *device_obj will contain handle to the new device object.
- * Otherwise, does not create the device object, ensures the Bridge driver
- * module is unloaded, and sets *device_obj to NULL.
- */
-extern int dev_create_iva_device(struct dev_object
- **device_obj,
- const char *driver_file_name,
- const struct cfg_hostres
- *host_config,
- struct cfg_devnode *dev_node_obj);
-
-/*
* ======== dev_create2 ========
* Purpose:
* After successful loading of the image from api_init_complete2
@@ -542,24 +505,6 @@ extern void dev_exit(void);
extern bool dev_init(void);
/*
- * ======== dev_is_locked ========
- * Purpose:
- * Predicate function to determine if the device has been
- * locked by a client for exclusive access.
- * Parameters:
- * hdev_obj: Handle to device object created with
- * dev_create_device().
- * Returns:
- * 0: TRUE: device has been locked.
- * 0: FALSE: device not locked.
- * -EFAULT: hdev_obj was invalid.
- * Requires:
- * DEV Initialized.
- * Ensures:
- */
-extern int dev_is_locked(struct dev_object *hdev_obj);
-
-/*
* ======== dev_insert_proc_object ========
* Purpose:
* Inserts the Processor Object into the List of PROC Objects
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspio.h b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
index 88f5f90..5c666b8 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspio.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
@@ -34,7 +34,6 @@ extern int bridge_io_destroy(struct io_mgr *hio_mgr);
extern int bridge_io_on_loaded(struct io_mgr *hio_mgr);
-extern int iva_io_on_loaded(struct io_mgr *hio_mgr);
extern int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
struct dsp_procloadstat *proc_lstat);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/host_os.h b/drivers/staging/tidspbridge/include/dspbridge/host_os.h
index 6549898..b1b8acb 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/host_os.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/host_os.h
@@ -57,13 +57,4 @@
extern struct platform_device *omap_dspbridge_dev;
extern struct device *bridge;
-#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)
-extern void dspbridge_reserve_sdram(void);
-#else
-static inline void dspbridge_reserve_sdram(void)
-{
-}
-#endif
-
-extern unsigned long dspbridge_get_mempool_base(void);
#endif
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io.h b/drivers/staging/tidspbridge/include/dspbridge/io.h
index bc346f9..da4683c 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io.h
@@ -95,20 +95,4 @@ extern void io_exit(void);
*/
extern bool io_init(void);
-/*
- * ======== io_on_loaded ========
- * Purpose:
- * Called when a program is loaded so IO manager can update its
- * internal state.
- * Parameters:
- * hio_mgr: IOmanager object.
- * Returns:
- * 0: Success.
- * -EFAULT: hio_mgr was invalid.
- * Requires:
- * io_init(void) called.
- * Ensures:
- */
-extern int io_on_loaded(struct io_mgr *hio_mgr);
-
#endif /* CHNL_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
index bcde1d9..8778ab4 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
@@ -120,122 +120,6 @@ extern void io_request_chnl(struct io_mgr *io_manager,
extern void iosm_schedule(struct io_mgr *io_manager);
/*
- * DSP-DMA IO functions
- */
-
-/*
- * ======== io_ddma_init_chnl_desc ========
- * Purpose:
- * Initialize DSP DMA channel descriptor.
- * Parameters:
- * hio_mgr: Handle to a I/O manager.
- * ddma_chnl_id: DDMA channel identifier.
- * num_desc: Number of buffer descriptors(equals # of IOReqs &
- * Chirps)
- * dsp: Dsp address;
- * Returns:
- * Requires:
- * ddma_chnl_id < DDMA_MAXDDMACHNLS
- * num_desc > 0
- * pVa != NULL
- * pDspPa != NULL
- *
- * Ensures:
- */
-extern void io_ddma_init_chnl_desc(struct io_mgr *hio_mgr, u32 ddma_chnl_id,
- u32 num_desc, void *dsp);
-
-/*
- * ======== io_ddma_clear_chnl_desc ========
- * Purpose:
- * Clear DSP DMA channel descriptor.
- * Parameters:
- * hio_mgr: Handle to a I/O manager.
- * ddma_chnl_id: DDMA channel identifier.
- * Returns:
- * Requires:
- * ddma_chnl_id < DDMA_MAXDDMACHNLS
- * Ensures:
- */
-extern void io_ddma_clear_chnl_desc(struct io_mgr *hio_mgr, u32 ddma_chnl_id);
-
-/*
- * ======== io_ddma_request_chnl ========
- * Purpose:
- * Request channel DSP-DMA from the DSP. Sets up SM descriptors and
- * control fields in shared memory.
- * Parameters:
- * hio_mgr: Handle to a I/O manager.
- * pchnl: Ptr to channel object
- * chnl_packet_obj: Ptr to channel i/o request packet.
- * Returns:
- * Requires:
- * pchnl != NULL
- * pchnl->cio_reqs > 0
- * chnl_packet_obj != NULL
- * Ensures:
- */
-extern void io_ddma_request_chnl(struct io_mgr *hio_mgr,
- struct chnl_object *pchnl,
- struct chnl_irp *chnl_packet_obj,
- u16 *mbx_val);
-
-/*
- * Zero-copy IO functions
- */
-
-/*
- * ======== io_ddzc_init_chnl_desc ========
- * Purpose:
- * Initialize ZCPY channel descriptor.
- * Parameters:
- * hio_mgr: Handle to a I/O manager.
- * zid: zero-copy channel identifier.
- * Returns:
- * Requires:
- * ddma_chnl_id < DDMA_MAXZCPYCHNLS
- * hio_mgr != Null
- * Ensures:
- */
-extern void io_ddzc_init_chnl_desc(struct io_mgr *hio_mgr, u32 zid);
-
-/*
- * ======== io_ddzc_clear_chnl_desc ========
- * Purpose:
- * Clear DSP ZC channel descriptor.
- * Parameters:
- * hio_mgr: Handle to a I/O manager.
- * ch_id: ZC channel identifier.
- * Returns:
- * Requires:
- * hio_mgr is valid
- * ch_id < DDMA_MAXZCPYCHNLS
- * Ensures:
- */
-extern void io_ddzc_clear_chnl_desc(struct io_mgr *hio_mgr, u32 ch_id);
-
-/*
- * ======== io_ddzc_request_chnl ========
- * Purpose:
- * Request zero-copy channel transfer. Sets up SM descriptors and
- * control fields in shared memory.
- * Parameters:
- * hio_mgr: Handle to a I/O manager.
- * pchnl: Ptr to channel object
- * chnl_packet_obj: Ptr to channel i/o request packet.
- * Returns:
- * Requires:
- * pchnl != NULL
- * pchnl->cio_reqs > 0
- * chnl_packet_obj != NULL
- * Ensures:
- */
-extern void io_ddzc_request_chnl(struct io_mgr *hio_mgr,
- struct chnl_object *pchnl,
- struct chnl_irp *chnl_packet_obj,
- u16 *mbx_val);
-
-/*
* ======== io_sh_msetting ========
* Purpose:
* Sets the shared memory setting
@@ -258,25 +142,6 @@ extern int io_sh_msetting(struct io_mgr *hio_mgr, u8 desc, void *pargs);
/* Maximum channel bufsize that can be used. */
extern u32 io_buf_size(struct io_mgr *hio_mgr);
-extern u32 io_read_value(struct bridge_dev_context *dev_ctxt, u32 dsp_addr);
-
-extern void io_write_value(struct bridge_dev_context *dev_ctxt,
- u32 dsp_addr, u32 value);
-
-extern u32 io_read_value_long(struct bridge_dev_context *dev_ctxt,
- u32 dsp_addr);
-
-extern void io_write_value_long(struct bridge_dev_context *dev_ctxt,
- u32 dsp_addr, u32 value);
-
-extern void io_or_set_value(struct bridge_dev_context *dev_ctxt,
- u32 dsp_addr, u32 value);
-
-extern void io_and_set_value(struct bridge_dev_context *dev_ctxt,
- u32 dsp_addr, u32 value);
-
-extern void io_sm_init(void);
-
#ifdef CONFIG_TIDSPBRIDGE_BACKTRACE
/*
* ========print_dsp_trace_buffer ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index 49ed5c1..4c5558c 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -113,24 +113,6 @@ extern int node_alloc_msg_buf(struct node_object *hnode,
extern int node_change_priority(struct node_object *hnode, s32 prio);
/*
- * ======== node_close_orphans ========
- * Purpose:
- * Delete all nodes whose owning processor is being destroyed.
- * Parameters:
- * hnode_mgr: Node manager object.
- * proc: Handle to processor object being destroyed.
- * Returns:
- * 0: Success.
- * -EPERM: Unable to delete all nodes belonging to proc.
- * Requires:
- * Valid hnode_mgr.
- * proc != NULL.
- * Ensures:
- */
-extern int node_close_orphans(struct node_mgr *hnode_mgr,
- struct proc_object *proc);
-
-/*
* ======== node_connect ========
* Purpose:
* Connect two nodes on the DSP, or a node on the DSP to the GPP. In the
diff --git a/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h b/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
index dfaf0c6..8c9c902 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
@@ -17,23 +17,12 @@
#include <dspbridge/nodepriv.h>
#include <dspbridge/drv.h>
-extern int drv_get_proc_ctxt_list(struct process_context **pctxt,
- struct drv_object *hdrv_obj);
-
-extern int drv_insert_proc_context(struct drv_object *driver_obj,
- void *process_ctxt);
-
extern int drv_remove_all_dmm_res_elements(void *process_ctxt);
extern int drv_remove_all_node_res_elements(void *process_ctxt);
-extern int drv_proc_set_pid(void *ctxt, s32 process);
-
extern int drv_remove_all_resources(void *process_ctxt);
-extern int drv_remove_proc_context(struct drv_object *driver_obj,
- void *pr_ctxt);
-
extern int drv_insert_node_res_element(void *hnode, void *node_resource,
void *process_ctxt);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/strm.h b/drivers/staging/tidspbridge/include/dspbridge/strm.h
index 3e4671e..613fe53 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/strm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/strm.h
@@ -142,25 +142,6 @@ extern int strm_free_buffer(struct strm_res_object *strmres,
struct process_context *pr_ctxt);
/*
- * ======== strm_get_event_handle ========
- * Purpose:
- * Get stream's user event handle. This function is used when closing
- * a stream, so the event can be closed.
- * Parameter:
- * stream_obj: Stream handle returned from strm_open().
- * ph_event: Location to store event handle on output.
- * Returns:
- * 0: Success.
- * -EFAULT: Invalid stream_obj.
- * Requires:
- * strm_init(void) called.
- * ph_event != NULL.
- * Ensures:
- */
-extern int strm_get_event_handle(struct strm_object *stream_obj,
- void **ph_event);
-
-/*
* ======== strm_get_info ========
* Purpose:
* Get information about a stream. User's dsp_streaminfo is contained
@@ -276,27 +257,6 @@ extern int strm_open(struct node_object *hnode, u32 dir,
struct process_context *pr_ctxt);
/*
- * ======== strm_prepare_buffer ========
- * Purpose:
- * Prepare a data buffer not allocated by DSPStream_AllocateBuffers()
- * for use with a stream.
- * Parameter:
- * stream_obj: Stream handle returned from strm_open().
- * usize: Size (GPP bytes) of the buffer.
- * pbuffer: Buffer address.
- * Returns:
- * 0: Success.
- * -EFAULT: Invalid stream_obj.
- * -EPERM: Failure occurred, unable to prepare buffer.
- * Requires:
- * strm_init(void) called.
- * pbuffer != NULL.
- * Ensures:
- */
-extern int strm_prepare_buffer(struct strm_object *stream_obj,
- u32 usize, u8 *pbuffer);
-
-/*
* ======== strm_reclaim ========
* Purpose:
* Request a buffer back from a stream.
@@ -379,26 +339,4 @@ extern int strm_register_notify(struct strm_object *stream_obj,
extern int strm_select(struct strm_object **strm_tab,
u32 strms, u32 *pmask, u32 utimeout);
-/*
- * ======== strm_unprepare_buffer ========
- * Purpose:
- * Unprepare a data buffer that was previously prepared for a stream
- * with DSPStream_PrepareBuffer(), and that will no longer be used with
- * the stream.
- * Parameter:
- * stream_obj: Stream handle returned from strm_open().
- * usize: Size (GPP bytes) of the buffer.
- * pbuffer: Buffer address.
- * Returns:
- * 0: Success.
- * -EFAULT: Invalid stream_obj.
- * -EPERM: Failure occurred, unable to unprepare buffer.
- * Requires:
- * strm_init(void) called.
- * pbuffer != NULL.
- * Ensures:
- */
-extern int strm_unprepare_buffer(struct strm_object *stream_obj,
- u32 usize, u8 *pbuffer);
-
#endif /* STRM_ */
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index 52989ab..db29a19 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -78,12 +78,9 @@ static struct dbll_fxns ldr_fxns = {
(dbll_get_sect_fxn) dbll_get_sect,
(dbll_init_fxn) dbll_init,
(dbll_load_fxn) dbll_load,
- (dbll_load_sect_fxn) dbll_load_sect,
(dbll_open_fxn) dbll_open,
(dbll_read_sect_fxn) dbll_read_sect,
- (dbll_set_attrs_fxn) dbll_set_attrs,
(dbll_unload_fxn) dbll_unload,
- (dbll_unload_sect_fxn) dbll_unload_sect,
};
static bool no_op(void);
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c
index 878aa50..2f46b06 100644
--- a/drivers/staging/tidspbridge/pmgr/dbll.c
+++ b/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -568,18 +568,6 @@ int dbll_load(struct dbll_library_obj *lib, dbll_flags flags,
}
/*
- * ======== dbll_load_sect ========
- * Not supported for COFF.
- */
-int dbll_load_sect(struct dbll_library_obj *zl_lib, char *sec_name,
- struct dbll_attrs *attrs)
-{
- DBC_REQUIRE(zl_lib);
-
- return -ENOSYS;
-}
-
-/*
* ======== dbll_open ========
*/
int dbll_open(struct dbll_tar_obj *target, char *file, dbll_flags flags,
@@ -794,22 +782,6 @@ func_cont:
}
/*
- * ======== dbll_set_attrs ========
- * Set the attributes of the target.
- */
-void dbll_set_attrs(struct dbll_tar_obj *target, struct dbll_attrs *pattrs)
-{
- struct dbll_tar_obj *zl_target = (struct dbll_tar_obj *)target;
- DBC_REQUIRE(refs > 0);
- DBC_REQUIRE(zl_target);
- DBC_REQUIRE(pattrs != NULL);
-
- if ((pattrs != NULL) && (zl_target != NULL))
- zl_target->attrs = *pattrs;
-
-}
-
-/*
* ======== dbll_unload ========
*/
void dbll_unload(struct dbll_library_obj *lib, struct dbll_attrs *attrs)
@@ -848,19 +820,6 @@ func_end:
}
/*
- * ======== dbll_unload_sect ========
- * Not supported for COFF.
- */
-int dbll_unload_sect(struct dbll_library_obj *lib, char *sec_name,
- struct dbll_attrs *attrs)
-{
- DBC_REQUIRE(refs > 0);
- DBC_REQUIRE(sec_name != NULL);
-
- return -ENOSYS;
-}
-
-/*
* ======== dof_close ========
*/
static void dof_close(struct dbll_library_obj *zl_lib)
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index a6ae007..26cfb32 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -260,12 +260,9 @@ static struct dbll_fxns ldr_fxns = {
(dbll_get_sect_fxn) dbll_get_sect,
(dbll_init_fxn) dbll_init,
(dbll_load_fxn) dbll_load,
- (dbll_load_sect_fxn) dbll_load_sect,
(dbll_open_fxn) dbll_open,
(dbll_read_sect_fxn) dbll_read_sect,
- (dbll_set_attrs_fxn) dbll_set_attrs,
(dbll_unload_fxn) dbll_unload,
- (dbll_unload_sect_fxn) dbll_unload_sect,
};
static u32 refs; /* module reference count */
--
1.6.3.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/5] staging:tidspbridge - Remove unused structs
2010-12-17 1:18 ` [PATCH 2/5] staging:tidspbridge - Remove unused functions Armando Uribe
@ 2010-12-17 1:18 ` Armando Uribe
2010-12-17 1:18 ` [PATCH 4/5] staging:tidspbridge - Remove unused typedefs Armando Uribe
0 siblings, 1 reply; 7+ messages in thread
From: Armando Uribe @ 2010-12-17 1:18 UTC (permalink / raw)
To: omar.ramirez
Cc: x0095078, ohad, felipe.contreras, rene.sapiens, nm, ernesto,
devel, linux-kernel, linux-omap
Remove unused structs and its dependencies, like references
in other structs or as arguments of certain functions.
Signed-off-by: Armando Uribe <x0095078@ti.com>
---
.../tidspbridge/include/dspbridge/cfgdefs.h | 6 --
.../staging/tidspbridge/include/dspbridge/cod.h | 10 +----
.../tidspbridge/include/dspbridge/dbldefs.h | 49 --------------------
.../staging/tidspbridge/include/dspbridge/drv.h | 14 ------
.../tidspbridge/include/dspbridge/dspapi-ioctl.h | 8 ---
.../staging/tidspbridge/include/dspbridge/ldr.h | 29 ------------
drivers/staging/tidspbridge/pmgr/cod.c | 11 +----
drivers/staging/tidspbridge/pmgr/dev.c | 8 +---
drivers/staging/tidspbridge/rmgr/dbdcd.c | 2 +-
9 files changed, 4 insertions(+), 133 deletions(-)
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/ldr.h
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
index c3f04f8..0589a0a 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
@@ -58,10 +58,4 @@ struct cfg_hostres {
void __iomem *dw_dmmu_base;
};
-struct cfg_dspmemdesc {
- u32 mem_type; /* Type of memory. */
- u32 ul_min; /* Minimum amount of memory of this type. */
- u32 ul_max; /* Maximum amount of memory of this type. */
-};
-
#endif /* CFGDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index 5efea91..53bd4bb 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -37,11 +37,6 @@ struct cod_manager;
/* COD library handle */
struct cod_libraryobj;
-/* COD attributes */
-struct cod_attrs {
- u32 ul_reserved;
-};
-
/*
* Function prototypes for writing memory to a DSP system, allocating
* and freeing DSP memory.
@@ -76,8 +71,6 @@ extern void cod_close(struct cod_libraryobj *lib);
* Parameters:
* manager: created manager object
* str_zl_file: ZL DLL filename, of length < COD_MAXPATHLENGTH.
- * attrs: attributes to be used by this object. A NULL value
- * will cause default attrs to be used.
* Returns:
* 0: Success.
* -ESPIPE: ZL_Create failed.
@@ -89,8 +82,7 @@ extern void cod_close(struct cod_libraryobj *lib);
* Ensures:
*/
extern int cod_create(struct cod_manager **mgr,
- char *str_zl_file,
- const struct cod_attrs *attrs);
+ char *str_zl_file);
/*
* ======== cod_delete ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
index 9973098..5cf9dad 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
@@ -25,26 +25,6 @@
typedef s32 dbl_flags;
/*
- * ======== dbl_sect_info ========
- * For collecting info on overlay sections
- */
-struct dbl_sect_info {
- const char *name; /* name of section */
- u32 sect_run_addr; /* run address of section */
- u32 sect_load_addr; /* load address of section */
- u32 size; /* size of section (target MAUs) */
- dbl_flags type; /* Code, data, or BSS */
-};
-
-/*
- * ======== dbl_symbol ========
- * (Needed for dynamic load library)
- */
-struct dbl_symbol {
- u32 value;
-};
-
-/*
* ======== dbl_alloc_fxn ========
* Allocate memory function. Allocate or reserve (if reserved == TRUE)
* "size" bytes of memory from segment "space" and return the address in
@@ -98,33 +78,4 @@ typedef bool(*dbl_sym_lookup) (void *handle, void *parg, void *rmm_handle,
typedef s32(*dbl_write_fxn) (void *hdl, u32 dsp_address, void *buf,
u32 n, s32 mtype);
-/*
- * ======== dbl_attrs ========
- */
-struct dbl_attrs {
- dbl_alloc_fxn alloc;
- dbl_free_fxn free;
- void *rmm_handle; /* Handle to pass to alloc, free functions */
- dbl_write_fxn write;
- void *input_params; /* Handle to pass to write, cinit function */
-
- dbl_log_write_fxn log_write;
- void *log_write_handle;
-
- /* Symbol matching function and handle to pass to it */
- dbl_sym_lookup sym_lookup;
- void *sym_handle;
- void *sym_arg;
-
- /*
- * These file manipulation functions should be compatible with the
- * "C" run time library functions of the same name.
- */
- s32(*fread) (void *, size_t, size_t, void *);
- s32(*fseek) (void *, long, int);
- s32(*ftell) (void *);
- s32(*fclose) (void *);
- void *(*fopen) (const char *, const char *);
-};
-
#endif /* DBLDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h
index adb28ec..26972ad 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
@@ -96,17 +96,6 @@ struct dmm_rsv_object {
u32 dsp_reserved_addr;
};
-/* New structure (member of process context) abstracts DMM resource info */
-struct dspheap_res_object {
- s32 heap_allocated; /* DMM status */
- u32 ul_mpu_addr;
- u32 ul_dsp_addr;
- u32 ul_dsp_res_addr;
- u32 heap_size;
- void *hprocessor;
- struct dspheap_res_object *next;
-};
-
/* New structure (member of process context) abstracts stream resource info */
struct strm_res_object {
s32 stream_allocated; /* Stream status */
@@ -151,9 +140,6 @@ struct process_context {
struct list_head dmm_rsv_list;
spinlock_t dmm_rsv_lock;
- /* DSP Heap resources */
- struct dspheap_res_object *pdspheap_list;
-
/* Stream resources */
struct idr *stream_id;
};
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h b/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
index 8da5bd8..8ad9ace 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
@@ -120,10 +120,6 @@ union trapped_args {
struct {
void *hprocessor;
- } args_proc_start;
-
- struct {
- void *hprocessor;
u32 ul_size;
void *__user *pp_rsv_addr;
} args_proc_rsvmem;
@@ -165,10 +161,6 @@ union trapped_args {
struct {
void *hprocessor;
- } args_proc_stop;
-
- struct {
- void *hprocessor;
void *pmpu_addr;
u32 ul_size;
} args_proc_invalidatememory;
diff --git a/drivers/staging/tidspbridge/include/dspbridge/ldr.h b/drivers/staging/tidspbridge/include/dspbridge/ldr.h
deleted file mode 100644
index 6a0269c..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/ldr.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * ldr.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Provide module loading services and symbol export services.
- *
- * Notes:
- * This service is meant to be used by modules of the DSP/BIOS Bridge
- * driver.
- *
- * 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 LDR_
-#define LDR_
-
-/* Loader objects: */
-struct ldr_module;
-
-#endif /* LDR_ */
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index db29a19..17ea57d 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -33,9 +33,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-/* ----------------------------------- OS Adaptation Layer */
-#include <dspbridge/ldr.h>
-
/* ----------------------------------- Platform Manager */
/* Include appropriate loader header file */
#include <dspbridge/dbll.h>
@@ -51,7 +48,6 @@ struct cod_manager {
struct dbll_library_obj *base_lib;
bool loaded; /* Base library loaded? */
u32 ul_entry;
- struct ldr_module *dll_obj;
struct dbll_fxns fxns;
struct dbll_attrs attrs;
char sz_zl_file[COD_MAXPATHLENGTH];
@@ -206,8 +202,7 @@ void cod_close(struct cod_libraryobj *lib)
* dynamically loaded object files.
*
*/
-int cod_create(struct cod_manager **mgr, char *str_zl_file,
- const struct cod_attrs *attrs)
+int cod_create(struct cod_manager **mgr, char *str_zl_file)
{
struct cod_manager *mgr_new;
struct dbll_attrs zl_attrs;
@@ -219,10 +214,6 @@ int cod_create(struct cod_manager **mgr, char *str_zl_file,
/* assume failure */
*mgr = NULL;
- /* we don't support non-default attrs yet */
- if (attrs != NULL)
- return -ENOSYS;
-
mgr_new = kzalloc(sizeof(struct cod_manager), GFP_KERNEL);
if (mgr_new == NULL)
return -ENOMEM;
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index b95cd20..0f10a50 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -27,9 +27,6 @@
/* ----------------------------------- Trace & Debug */
#include <dspbridge/dbc.h>
-/* ----------------------------------- OS Adaptation Layer */
-#include <dspbridge/ldr.h>
-
/* ----------------------------------- Platform Manager */
#include <dspbridge/cod.h>
#include <dspbridge/drv.h>
@@ -75,7 +72,6 @@ struct dev_object {
struct io_mgr *hio_mgr; /* IO manager (CHNL, msg_ctrl) */
struct cmm_object *hcmm_mgr; /* SM memory manager. */
struct dmm_object *dmm_mgr; /* Dynamic memory manager. */
- struct ldr_module *module_obj; /* Bridge Module handle. */
u32 word_size; /* DSP word size: quick access. */
struct drv_object *hdrv_obj; /* Driver Object */
/* List of Processors attached to this device */
@@ -139,7 +135,6 @@ int dev_create_device(struct dev_object **device_obj,
struct cfg_devnode *dev_node_obj)
{
struct cfg_hostres *host_res;
- struct ldr_module *module_obj = NULL;
struct bridge_drv_interface *drv_fxns = NULL;
struct dev_object *dev_obj = NULL;
struct chnl_mgrattrs mgr_attrs;
@@ -179,7 +174,6 @@ int dev_create_device(struct dev_object **device_obj,
if (dev_obj) {
/* Fill out the rest of the Dev Object structure: */
dev_obj->dev_node_obj = dev_node_obj;
- dev_obj->module_obj = module_obj;
dev_obj->cod_mgr = NULL;
dev_obj->hchnl_mgr = NULL;
dev_obj->hdeh_mgr = NULL;
@@ -953,7 +947,7 @@ static int init_cod_mgr(struct dev_object *dev_obj)
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(!dev_obj || (dev_obj->cod_mgr == NULL));
- status = cod_create(&dev_obj->cod_mgr, sz_dummy_file, NULL);
+ status = cod_create(&dev_obj->cod_mgr, sz_dummy_file);
return status;
}
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 3581a55..f01cf07 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -134,7 +134,7 @@ int dcd_create_manager(char *sz_zl_dll_name,
DBC_REQUIRE(refs >= 0);
DBC_REQUIRE(dcd_mgr);
- status = cod_create(&cod_mgr, sz_zl_dll_name, NULL);
+ status = cod_create(&cod_mgr, sz_zl_dll_name);
if (status)
goto func_end;
--
1.6.3.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/5] staging:tidspbridge - Remove unused typedefs
2010-12-17 1:18 ` [PATCH 3/5] staging:tidspbridge - Remove unused structs Armando Uribe
@ 2010-12-17 1:18 ` Armando Uribe
2010-12-17 1:18 ` [PATCH 5/5] staging:tidspbridge - Remove trivial header files Armando Uribe
0 siblings, 1 reply; 7+ messages in thread
From: Armando Uribe @ 2010-12-17 1:18 UTC (permalink / raw)
To: omar.ramirez
Cc: x0095078, ohad, felipe.contreras, rene.sapiens, nm, ernesto,
devel, linux-kernel, linux-omap
Unsed typedefs are removed, because of there are not
used or because previous clean ups.
Signed-off-by: Armando Uribe <x0095078@ti.com>
---
.../tidspbridge/include/dspbridge/dbldefs.h | 81 --------------------
.../tidspbridge/include/dspbridge/dblldefs.h | 62 ---------------
2 files changed, 0 insertions(+), 143 deletions(-)
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
deleted file mode 100644
index 5cf9dad..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * dbldefs.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * 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 DBLDEFS_
-#define DBLDEFS_
-
-
-/*
- * ======== dbl_flags ========
- * Specifies whether to load code, data, or symbols
- */
-typedef s32 dbl_flags;
-
-/*
- * ======== dbl_alloc_fxn ========
- * Allocate memory function. Allocate or reserve (if reserved == TRUE)
- * "size" bytes of memory from segment "space" and return the address in
- * *dsp_address (or starting at *dsp_address if reserve == TRUE). Returns 0 on
- * success, or an error code on failure.
- */
-typedef s32(*dbl_alloc_fxn) (void *hdl, s32 space, u32 size, u32 align,
- u32 *dsp_address, s32 seg_id, s32 req,
- bool reserved);
-
-/*
- * ======== dbl_free_fxn ========
- * Free memory function. Free, or unreserve (if reserved == TRUE) "size"
- * bytes of memory from segment "space"
- */
-typedef bool(*dbl_free_fxn) (void *hdl, u32 addr, s32 space, u32 size,
- bool reserved);
-
-/*
- * ======== dbl_log_write_fxn ========
- * Function to call when writing data from a section, to log the info.
- * Can be NULL if no logging is required.
- */
-typedef int(*dbl_log_write_fxn) (void *handle,
- struct dbl_sect_info *sect, u32 addr,
- u32 bytes);
-
-/*
- * ======== dbl_sym_lookup ========
- * Symbol lookup function - Find the symbol name and return its value.
- *
- * Parameters:
- * handle - Opaque handle
- * parg - Opaque argument.
- * name - Name of symbol to lookup.
- * sym - Location to store address of symbol structure.
- *
- * Returns:
- * TRUE: Success (symbol was found).
- * FALSE: Failed to find symbol.
- */
-typedef bool(*dbl_sym_lookup) (void *handle, void *parg, void *rmm_handle,
- const char *name, struct dbl_symbol ** sym);
-
-/*
- * ======== dbl_write_fxn ========
- * Write memory function. Write "n" HOST bytes of memory to segment "mtype"
- * starting at address "dsp_address" from the buffer "buf". The buffer is
- * formatted as an array of words appropriate for the DSP.
- */
-typedef s32(*dbl_write_fxn) (void *hdl, u32 dsp_address, void *buf,
- u32 n, s32 mtype);
-
-#endif /* DBLDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h b/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
index 81821e5..30e0aa0 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
@@ -348,29 +348,6 @@ typedef bool(*dbll_init_fxn) (void);
typedef int(*dbll_load_fxn) (struct dbll_library_obj *lib,
dbll_flags flags,
struct dbll_attrs *attrs, u32 *entry);
-
-/*
- * ======== dbll_load_sect ========
- * Load a named section from an library (for overlay support).
- * Parameters:
- * lib - Handle returned from dbll_open().
- * sec_name - Name of section to load.
- * attrs - Contains write function and handle to pass to it.
- * Returns:
- * 0: Success.
- * -ENXIO: Section not found.
- * -ENOSYS: Function not implemented.
- * Requires:
- * Valid lib.
- * sec_name != NULL.
- * attrs != NULL.
- * attrs->write != NULL.
- * Ensures:
- */
-typedef int(*dbll_load_sect_fxn) (struct dbll_library_obj *lib,
- char *sz_sect_name,
- struct dbll_attrs *attrs);
-
/*
* ======== dbll_open ========
* dbll_open() returns a library handle that can be used to load/unload
@@ -421,23 +398,6 @@ typedef int(*dbll_open_fxn) (struct dbll_tar_obj *target, char *file,
typedef int(*dbll_read_sect_fxn) (struct dbll_library_obj *lib,
char *name, char *content,
u32 cont_size);
-
-/*
- * ======== dbll_set_attrs ========
- * Set the attributes of the target.
- * Parameters:
- * target - Handle returned from dbll_create().
- * pattrs - New attributes.
- * Returns:
- * Requires:
- * DBL initialized.
- * Valid target.
- * pattrs != NULL.
- * Ensures:
- */
-typedef void (*dbll_set_attrs_fxn) (struct dbll_tar_obj *target,
- struct dbll_attrs *attrs);
-
/*
* ======== dbll_unload ========
* Unload library loaded with dbll_load().
@@ -452,28 +412,6 @@ typedef void (*dbll_set_attrs_fxn) (struct dbll_tar_obj *target,
*/
typedef void (*dbll_unload_fxn) (struct dbll_library_obj *library,
struct dbll_attrs *attrs);
-
-/*
- * ======== dbll_unload_sect ========
- * Unload a named section from an library (for overlay support).
- * Parameters:
- * lib - Handle returned from dbll_open().
- * sec_name - Name of section to load.
- * attrs - Contains free() function and handle to pass to it.
- * Returns:
- * 0: Success.
- * -ENXIO: Named section not found.
- * -ENOSYS
- * Requires:
- * DBL initialized.
- * Valid lib.
- * sec_name != NULL.
- * Ensures:
- */
-typedef int(*dbll_unload_sect_fxn) (struct dbll_library_obj *lib,
- char *sz_sect_name,
- struct dbll_attrs *attrs);
-
struct dbll_fxns {
dbll_close_fxn close_fxn;
dbll_create_fxn create_fxn;
--
1.6.3.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 5/5] staging:tidspbridge - Remove trivial header files
2010-12-17 1:18 ` [PATCH 4/5] staging:tidspbridge - Remove unused typedefs Armando Uribe
@ 2010-12-17 1:18 ` Armando Uribe
0 siblings, 0 replies; 7+ messages in thread
From: Armando Uribe @ 2010-12-17 1:18 UTC (permalink / raw)
To: omar.ramirez
Cc: x0095078, ohad, felipe.contreras, rene.sapiens, nm, ernesto,
devel, linux-kernel, linux-omap
Remove the header files that contains few declarations
and can be merged onto more generic headers.
Signed-off-by: Armando Uribe <x0095078@ti.com>
---
drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 4 +-
.../tidspbridge/include/dspbridge/dehdefs.h | 31 -----------------
.../staging/tidspbridge/include/dspbridge/dev.h | 4 +-
.../staging/tidspbridge/include/dspbridge/disp.h | 15 ++++++++-
.../tidspbridge/include/dspbridge/dispdefs.h | 35 --------------------
.../staging/tidspbridge/include/dspbridge/drv.h | 4 ++-
.../tidspbridge/include/dspbridge/drvdefs.h | 25 --------------
.../tidspbridge/include/dspbridge/dspdefs.h | 4 +-
.../staging/tidspbridge/include/dspbridge/dspio.h | 3 +-
drivers/staging/tidspbridge/include/dspbridge/io.h | 13 +++++++-
.../staging/tidspbridge/include/dspbridge/io_sm.h | 7 +++-
.../staging/tidspbridge/include/dspbridge/iodefs.h | 34 -------------------
.../staging/tidspbridge/include/dspbridge/node.h | 2 +-
.../staging/tidspbridge/include/dspbridge/pwr.h | 8 ++++-
.../staging/tidspbridge/include/dspbridge/pwr_sh.h | 29 ----------------
drivers/staging/tidspbridge/pmgr/io.c | 1 -
drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 -
drivers/staging/tidspbridge/rmgr/node.c | 1 -
18 files changed, 51 insertions(+), 170 deletions(-)
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dispdefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/drvdefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/iodefs.h
delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
index fb9026e..8e2b50f 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
@@ -29,13 +29,13 @@
/* ----------------------------------- Platform Manager */
#include <dspbridge/brddefs.h>
#include <dspbridge/dev.h>
-#include <dspbridge/iodefs.h>
+#include <dspbridge/io.h>
/* ------------------------------------ Hardware Abstraction Layer */
#include <hw_defs.h>
#include <hw_mmu.h>
-#include <dspbridge/pwr_sh.h>
+#include <dspbridge/pwr.h>
/* ----------------------------------- Bridge Driver */
#include <dspbridge/dspdeh.h>
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dehdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
deleted file mode 100644
index 5341471..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * dehdefs.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Definition for Bridge driver module DEH.
- *
- * 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 DEHDEFS_
-#define DEHDEFS_
-
-#include <dspbridge/mbx_sh.h> /* shared mailbox codes */
-
-/* DEH object manager */
-struct deh_mgr;
-
-/* Magic code used to determine if DSP signaled exception. */
-#define DEH_BASE MBX_DEH_BASE
-#define DEH_LIMIT MBX_DEH_LIMIT
-
-#endif /* _DEHDEFS_H */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index 4d4196b..37d1fff 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -23,9 +23,9 @@
#include <dspbridge/chnldefs.h>
#include <dspbridge/cmm.h>
#include <dspbridge/cod.h>
-#include <dspbridge/dehdefs.h>
+#include <dspbridge/dspdeh.h>
#include <dspbridge/nodedefs.h>
-#include <dspbridge/dispdefs.h>
+#include <dspbridge/disp.h>
#include <dspbridge/dspdefs.h>
#include <dspbridge/dmm.h>
#include <dspbridge/host_os.h>
diff --git a/drivers/staging/tidspbridge/include/dspbridge/disp.h b/drivers/staging/tidspbridge/include/dspbridge/disp.h
index 82bf721..41738c5 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/disp.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/disp.h
@@ -22,7 +22,20 @@
#include <dspbridge/dbdefs.h>
#include <dspbridge/nodedefs.h>
#include <dspbridge/nodepriv.h>
-#include <dspbridge/dispdefs.h>
+
+struct disp_object;
+
+/* Node Dispatcher attributes */
+struct disp_attr {
+ u32 ul_chnl_offset; /* Offset of channel ids reserved for RMS */
+ /* Size of buffer for sending data to RMS */
+ u32 ul_chnl_buf_size;
+ int proc_family; /* eg, 5000 */
+ int proc_type; /* eg, 5510 */
+ void *reserved1; /* Reserved for future use. */
+ u32 reserved2; /* Reserved for future use. */
+};
+
/*
* ======== disp_create ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dispdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dispdefs.h
deleted file mode 100644
index 946551a..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/dispdefs.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * dispdefs.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Global DISP constants and types, shared by PROCESSOR, NODE, and DISP.
- *
- * 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 DISPDEFS_
-#define DISPDEFS_
-
-struct disp_object;
-
-/* Node Dispatcher attributes */
-struct disp_attr {
- u32 ul_chnl_offset; /* Offset of channel ids reserved for RMS */
- /* Size of buffer for sending data to RMS */
- u32 ul_chnl_buf_size;
- int proc_family; /* eg, 5000 */
- int proc_type; /* eg, 5510 */
- void *reserved1; /* Reserved for future use. */
- u32 reserved2; /* Reserved for future use. */
-};
-
-#endif /* DISPDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h
index 26972ad..bcb2817 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
@@ -23,9 +23,11 @@
#include <dspbridge/devdefs.h>
-#include <dspbridge/drvdefs.h>
#include <linux/idr.h>
+/* Bridge Driver Object */
+struct drv_object;
+
/* Provide the DSP Internal memory windows that can be accessed from L3 address
* space */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drvdefs.h b/drivers/staging/tidspbridge/include/dspbridge/drvdefs.h
deleted file mode 100644
index 2920917..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/drvdefs.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * drvdefs.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Definition of common struct between dspdefs.h and drv.h.
- *
- * 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 DRVDEFS_
-#define DRVDEFS_
-
-/* Bridge Driver Object */
-struct drv_object;
-
-#endif /* DRVDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index 2acbbb3..4eaeb21 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -32,9 +32,9 @@
#include <dspbridge/brddefs.h>
#include <dspbridge/cfgdefs.h>
#include <dspbridge/chnlpriv.h>
-#include <dspbridge/dehdefs.h>
+#include <dspbridge/dspdeh.h>
#include <dspbridge/devdefs.h>
-#include <dspbridge/iodefs.h>
+#include <dspbridge/io.h>
#include <dspbridge/msgdefs.h>
/* Handle to Bridge driver's private device context. */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspio.h b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
index 5c666b8..66b64fa 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspio.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
@@ -24,7 +24,8 @@
#define DSPIO_
#include <dspbridge/devdefs.h>
-#include <dspbridge/iodefs.h>
+#include <dspbridge/io.h>
+
extern int bridge_io_create(struct io_mgr **io_man,
struct dev_object *hdev_obj,
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io.h b/drivers/staging/tidspbridge/include/dspbridge/io.h
index da4683c..9615980 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io.h
@@ -22,7 +22,18 @@
#include <dspbridge/cfgdefs.h>
#include <dspbridge/devdefs.h>
-#include <dspbridge/iodefs.h>
+/* IO Objects: */
+struct io_mgr;
+
+/* IO manager attributes: */
+struct io_attrs {
+ u8 birq; /* Channel's I/O IRQ number. */
+ bool irq_shared; /* TRUE if the IRQ is shareable. */
+ u32 word_size; /* DSP Word size. */
+ u32 shm_base; /* Physical base address of shared memory. */
+ u32 usm_length; /* Size (in bytes) of shared memory. */
+};
+
/*
* ======== io_create ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
index 8778ab4..6d26472 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
@@ -23,7 +23,12 @@
#include <dspbridge/_chnl_sm.h>
#include <dspbridge/host_os.h>
-#include <dspbridge/iodefs.h>
+#include <dspbridge/io.h>
+#include <dspbridge/mbx_sh.h> /* shared mailbox codes */
+
+/* Magic code used to determine if DSP signaled exception. */
+#define DEH_BASE MBX_DEH_BASE
+#define DEH_LIMIT MBX_DEH_LIMIT
#define IO_INPUT 0
#define IO_OUTPUT 1
diff --git a/drivers/staging/tidspbridge/include/dspbridge/iodefs.h b/drivers/staging/tidspbridge/include/dspbridge/iodefs.h
deleted file mode 100644
index 31cbc9a..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/iodefs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * iodefs.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * System-wide channel objects and constants.
- *
- * 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 IODEFS_
-#define IODEFS_
-
-/* IO Objects: */
-struct io_mgr;
-
-/* IO manager attributes: */
-struct io_attrs {
- u8 birq; /* Channel's I/O IRQ number. */
- bool irq_shared; /* TRUE if the IRQ is shareable. */
- u32 word_size; /* DSP Word size. */
- u32 shm_base; /* Physical base address of shared memory. */
- u32 usm_length; /* Size (in bytes) of shared memory. */
-};
-
-#endif /* IODEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index 4c5558c..63739c8 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -22,7 +22,7 @@
#include <dspbridge/procpriv.h>
#include <dspbridge/nodedefs.h>
-#include <dspbridge/dispdefs.h>
+#include <dspbridge/disp.h>
#include <dspbridge/nldrdefs.h>
#include <dspbridge/drv.h>
diff --git a/drivers/staging/tidspbridge/include/dspbridge/pwr.h b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
index a6dc783..5e3ab21 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/pwr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
@@ -18,7 +18,13 @@
#define PWR_
#include <dspbridge/dbdefs.h>
-#include <dspbridge/pwr_sh.h>
+#include <dspbridge/mbx_sh.h>
+
+/* valid sleep command codes that can be sent by GPP via mailbox: */
+#define PWR_DEEPSLEEP MBX_PM_DSPIDLE
+#define PWR_EMERGENCYDEEPSLEEP MBX_PM_EMERGENCYSLEEP
+#define PWR_WAKEUP MBX_PM_DSPWAKEUP
+
/*
* ======== pwr_sleep_dsp ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h b/drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
deleted file mode 100644
index c78a1b1..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * pwr_sh.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Power Manager shared definitions (used on both GPP and DSP sides).
- *
- * Copyright (C) 2008 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 PWR_SH_
-#define PWR_SH_
-
-#include <dspbridge/mbx_sh.h>
-
-/* valid sleep command codes that can be sent by GPP via mailbox: */
-#define PWR_DEEPSLEEP MBX_PM_DSPIDLE
-#define PWR_EMERGENCYDEEPSLEEP MBX_PM_EMERGENCYSLEEP
-#define PWR_WAKEUP MBX_PM_DSPWAKEUP
-
-#endif /* PWR_SH_ */
diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c
index 20cbb9f..0e8843f 100644
--- a/drivers/staging/tidspbridge/pmgr/io.c
+++ b/drivers/staging/tidspbridge/pmgr/io.c
@@ -31,7 +31,6 @@
/* ----------------------------------- This */
#include <ioobj.h>
-#include <dspbridge/iodefs.h>
#include <dspbridge/io.h>
/* ----------------------------------- Globals */
diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 324fcdf..c43c7e3 100644
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -59,7 +59,6 @@
#include <dspbridge/chnl.h>
#include <dspbridge/proc.h>
#include <dspbridge/dev.h>
-#include <dspbridge/drvdefs.h>
#include <dspbridge/drv.h>
#ifdef CONFIG_TIDSPBRIDGE_DVFS
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 62d5c31..9472729 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -64,7 +64,6 @@
#include <dspbridge/nldr.h>
#include <dspbridge/drv.h>
-#include <dspbridge/drvdefs.h>
#include <dspbridge/resourcecleanup.h>
#include <_tiomap.h>
--
1.6.3.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/5] staging:tidspbridge - Remove unused defined constants
2010-12-17 1:18 ` [PATCH 1/5] staging:tidspbridge - Remove unused defined constants Armando Uribe
2010-12-17 1:18 ` [PATCH 2/5] staging:tidspbridge - Remove unused functions Armando Uribe
@ 2010-12-24 7:39 ` Ramirez Luna, Omar
1 sibling, 0 replies; 7+ messages in thread
From: Ramirez Luna, Omar @ 2010-12-24 7:39 UTC (permalink / raw)
To: Armando Uribe
Cc: ohad, felipe.contreras, rene.sapiens, nm, ernesto, devel,
linux-kernel, linux-omap
Hi,
On Thu, Dec 16, 2010 at 7:18 PM, Armando Uribe <x0095078@ti.com> wrote:
> Remove defined constants not being used.
>
> Signed-off-by: Armando Uribe <x0095078@ti.com>
Pushed the entire series to dspbridge.
Regards,
Omar
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-12-24 7:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-17 1:18 [PATCH 0/5] staging:tidspbridge - Audit headers file Armando Uribe
2010-12-17 1:18 ` [PATCH 1/5] staging:tidspbridge - Remove unused defined constants Armando Uribe
2010-12-17 1:18 ` [PATCH 2/5] staging:tidspbridge - Remove unused functions Armando Uribe
2010-12-17 1:18 ` [PATCH 3/5] staging:tidspbridge - Remove unused structs Armando Uribe
2010-12-17 1:18 ` [PATCH 4/5] staging:tidspbridge - Remove unused typedefs Armando Uribe
2010-12-17 1:18 ` [PATCH 5/5] staging:tidspbridge - Remove trivial header files Armando Uribe
2010-12-24 7:39 ` [PATCH 1/5] staging:tidspbridge - Remove unused defined constants Ramirez Luna, Omar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®