Re: [PATCH] DSPBRIDGE: Remove variables not used in cfgdefs.h

2009-03-05 Thread Ameya Palande
On Wed, Mar 4, 2009 at 8:11 PM, Fernando Guzman Lugo  wrote:
> This patch removes some variable that are not used.
> Signed-off-by: Guzman Lugo Fernando 
> ---
>  arch/arm/plat-omap/include/dspbridge/cfgdefs.h |   10 --
>  drivers/dsp/bridge/rmgr/drv.c                  |    2 --
>  2 files changed, 0 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/dspbridge/cfgdefs.h 
> b/arch/arm/plat-omap/include/dspbridge/cfgdefs.h
> index e7633b5..34a28f8
> --- a/arch/arm/plat-omap/include/dspbridge/cfgdefs.h
> +++ b/arch/arm/plat-omap/include/dspbridge/cfgdefs.h
> @@ -77,15 +77,6 @@
>                u8 bIRQAttrib;  /* IRQ Attribute */
>                u32 dwOffsetForMonitor; /* The Shared memory starts from
>                                         * dwMemBase + this offset */
> -               u32 dwBusType;  /* Bus type for this device */
> -               u32 dwProgBase; /* DSP ProgBase */
> -               u32 dwProgLength;       /* DSP ProgBase Length */
> -               u32 dwRegBase;  /* DSP memory mapped register base */
> -               u32 dwRegLength;        /* DSP Register Base Length */
> -               u32 ClientHandle;       /* Client Handle */
> -               u32 SocketHandle;       /* Socket and Function Pair */
> -               u32 CardInfo;   /* This will be used as a context data in
> -                                * in the CardRequestIRQ */
>        /*
>         *  Info needed by NODE for allocating channels to communicate with 
> RMS:
>         *      dwChnlOffset:       Offset of RMS channels. Lower channels are
> @@ -102,7 +93,6 @@
>                void __iomem *dwWdTimerDspBase;
>                void __iomem *dwMboxBase;
>                void __iomem *dwDmmuBase;
> -               u32 *dwDipiBase;
>                void __iomem *dwSysCtrlBase;
>        } ;
>
> diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
> index 2241f48..160d730
> --- a/drivers/dsp/bridge/rmgr/drv.c
> +++ b/drivers/dsp/bridge/rmgr/drv.c
> @@ -1733,7 +1733,6 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, 
> s32 bRequest)
>                /* Second window is for DSP external memory shared with MPU */
>                if (DSP_SUCCEEDED(status)) {
>                        /* for Linux, these are hard-coded values */
> -                       pResources->dwBusType = 0;
>                        pResources->bIRQRegisters = 0;
>                        pResources->bIRQAttrib = 0;
>                        pResources->dwOffsetForMonitor = 0;
> @@ -1856,7 +1855,6 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 
> dwContext, s32 bRequest)
>                }
>                if (DSP_SUCCEEDED(status)) {
>                        /* for Linux, these are hard-coded values */
> -                       pResources->dwBusType = 0;
>                        pResources->bIRQRegisters = 0;
>                        pResources->bIRQAttrib = 0;
>                        pResources->dwOffsetForMonitor = 0;
> --
> 1.5.6.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Couldn't apply :(
I guess you missed the following commit.

commit 3b313ff3e50d3c46c506e8939f92c406aa5b0bc6
Author: Ramesh Gupta G 
Date:   Fri Feb 13 14:51:19 2009 +0530

patching file arch/arm/plat-omap/include/dspbridge/cfgdefs.h
Hunk #2 FAILED at 93.
1 out of 2 hunks FAILED -- saving rejects to file
arch/arm/plat-omap/include/dspbridge/cfgdefs.h.rej
patching file drivers/dsp/bridge/rmgr/drv.c
Hunk #1 succeeded at 1736 (offset 3 lines).
Hunk #2 succeeded at 1862 (offset 7 lines).

Cheers,
Ameya.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] DSPBRIDGE: Remove variables not used in cfgdefs.h

2009-03-04 Thread Fernando Guzman Lugo
This patch removes some variable that are not used.
Signed-off-by: Guzman Lugo Fernando 
---
 arch/arm/plat-omap/include/dspbridge/cfgdefs.h |   10 --
 drivers/dsp/bridge/rmgr/drv.c  |2 --
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/arch/arm/plat-omap/include/dspbridge/cfgdefs.h 
b/arch/arm/plat-omap/include/dspbridge/cfgdefs.h
index e7633b5..34a28f8
--- a/arch/arm/plat-omap/include/dspbridge/cfgdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/cfgdefs.h
@@ -77,15 +77,6 @@
u8 bIRQAttrib;  /* IRQ Attribute */
u32 dwOffsetForMonitor; /* The Shared memory starts from
 * dwMemBase + this offset */
-   u32 dwBusType;  /* Bus type for this device */
-   u32 dwProgBase; /* DSP ProgBase */
-   u32 dwProgLength;   /* DSP ProgBase Length */
-   u32 dwRegBase;  /* DSP memory mapped register base */
-   u32 dwRegLength;/* DSP Register Base Length */
-   u32 ClientHandle;   /* Client Handle */
-   u32 SocketHandle;   /* Socket and Function Pair */
-   u32 CardInfo;   /* This will be used as a context data in
-* in the CardRequestIRQ */
/*
 *  Info needed by NODE for allocating channels to communicate with RMS:
 *  dwChnlOffset:   Offset of RMS channels. Lower channels are
@@ -102,7 +93,6 @@
void __iomem *dwWdTimerDspBase;
void __iomem *dwMboxBase;
void __iomem *dwDmmuBase;
-   u32 *dwDipiBase;
void __iomem *dwSysCtrlBase;
} ;
 
diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c
index 2241f48..160d730
--- a/drivers/dsp/bridge/rmgr/drv.c
+++ b/drivers/dsp/bridge/rmgr/drv.c
@@ -1733,7 +1733,6 @@ static DSP_STATUS RequestBridgeResources(u32 dwContext, 
s32 bRequest)
/* Second window is for DSP external memory shared with MPU */
if (DSP_SUCCEEDED(status)) {
/* for Linux, these are hard-coded values */
-   pResources->dwBusType = 0;
pResources->bIRQRegisters = 0;
pResources->bIRQAttrib = 0;
pResources->dwOffsetForMonitor = 0;
@@ -1856,7 +1855,6 @@ static DSP_STATUS RequestBridgeResourcesDSP(u32 
dwContext, s32 bRequest)
}
if (DSP_SUCCEEDED(status)) {
/* for Linux, these are hard-coded values */
-   pResources->dwBusType = 0;
pResources->bIRQRegisters = 0;
pResources->bIRQAttrib = 0;
pResources->dwOffsetForMonitor = 0;
-- 
1.5.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html