2010-12-20 21:26:50

by Ernesto Ramos

Subject: [PATCH] staging: tidspbridge: remove code referred by OPT_ZERO_COPY_LOADER

Remove code referred by OPT_ZERO_COPY_LOADER since it is
not used.

Signed-off-by: Ernesto Ramos <[email protected]>
---
drivers/staging/tidspbridge/dynload/cload.c | 60 +++++++++------------------
1 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/drivers/staging/tidspbridge/dynload/cload.c b/drivers/staging/tidspbridge/dynload/cload.c
index a5cdfa1..7713e76 100644
--- a/drivers/staging/tidspbridge/dynload/cload.c
+++ b/drivers/staging/tidspbridge/dynload/cload.c
@@ -1133,9 +1133,6 @@ static void dload_data(struct dload_state *dlthis)
u16 curr_sect;
struct doff_scnhdr_t *sptr = dlthis->sect_hdrs;
struct ldr_section_info *lptr = dlthis->ldr_sections;
-#ifdef OPT_ZERO_COPY_LOADER
- bool zero_copy = false;
-#endif
u8 *dest;

struct {
@@ -1194,17 +1191,6 @@ static void dload_data(struct dload_state *dlthis)
return;
}
dest = ibuf.bufr;
-#ifdef OPT_ZERO_COPY_LOADER
- zero_copy = false;
- if (!dload_check_type(sptr, DLOAD_CINIT) {
- dlthis->myio->writemem(dlthis->myio,
- &dest,
- lptr->load_addr +
- image_offset,
- lptr, 0);
- zero_copy = (dest != ibuf.bufr);
- }
-#endif
/* End of determination */

if (dlthis->strm->read_buffer(dlthis->strm,
@@ -1268,33 +1254,27 @@ static void dload_data(struct dload_state *dlthis)
&ibuf.ipacket);
cinit_processed = true;
} else {
-#ifdef OPT_ZERO_COPY_LOADER
- if (!zero_copy) {
-#endif
- /* FIXME */
- if (!dlthis->myio->
- writemem(dlthis->
- myio,
- ibuf.bufr,
- lptr->
- load_addr +
- image_offset,
- lptr,
- BYTE_TO_HOST
- (ibuf.
- ipacket.
- packet_size))) {
- DL_ERROR
- ("Write to "
- FMT_UI32
- " failed",
- lptr->
- load_addr +
- image_offset);
- }
-#ifdef OPT_ZERO_COPY_LOADER
+ /* FIXME */
+ if (!dlthis->myio->
+ writemem(dlthis->
+ myio,
+ ibuf.bufr,
+ lptr->
+ load_addr +
+ image_offset,
+ lptr,
+ BYTE_TO_HOST
+ (ibuf.
+ ipacket.
+ packet_size))) {
+ DL_ERROR
+ ("Write to "
+ FMT_UI32
+ " failed",
+ lptr->
+ load_addr +
+ image_offset);
}
-#endif
}
}
image_offset +=
--
1.7.0.4

2010-12-24 07:43:30

by Ramirez Luna, Omar

Subject: Re: [PATCH] staging: tidspbridge: remove code referred by OPT_ZERO_COPY_LOADER

Hi,

On Mon, Dec 20, 2010 at 3:23 PM, Ernesto Ramos <[email protected]> wrote:
> Remove code referred by OPT_ZERO_COPY_LOADER since it is
> not used.
>
> Signed-off-by: Ernesto Ramos <[email protected]>
> ---
> ?drivers/staging/tidspbridge/dynload/cload.c | ? 60 +++++++++------------------
> ?1 files changed, 20 insertions(+), 40 deletions(-)

Pushed to dspbridge.

Regards,

Omar