diff options
Diffstat (limited to 'drivers/staging/tidspbridge')
| -rw-r--r-- | drivers/staging/tidspbridge/dynload/dload_internal.h | 8 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/dynload/reloc.c | 6 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/rmgr/drv_interface.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/tidspbridge/dynload/dload_internal.h b/drivers/staging/tidspbridge/dynload/dload_internal.h index 7b77573fba53..b9d079b96190 100644 --- a/drivers/staging/tidspbridge/dynload/dload_internal.h +++ b/drivers/staging/tidspbridge/dynload/dload_internal.h @@ -313,14 +313,14 @@ extern uint32_t dload_reverse_checksum16(void *data, unsigned siz); /* * exported by reloc.c */ -extern void dload_relocate(struct dload_state *dlthis, tgt_au_t * data, - struct reloc_record_t *rp, bool * tramps_generated, +extern void dload_relocate(struct dload_state *dlthis, tgt_au_t *data, + struct reloc_record_t *rp, bool *tramps_generated, bool second_pass); -extern rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t * data, +extern rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t *data, int fieldsz, int offset, unsigned sgn); -extern int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t * data, +extern int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t *data, int fieldsz, int offset, unsigned sgn); /* diff --git a/drivers/staging/tidspbridge/dynload/reloc.c b/drivers/staging/tidspbridge/dynload/reloc.c index 7b28c07ed7c5..463abdb6392f 100644 --- a/drivers/staging/tidspbridge/dynload/reloc.c +++ b/drivers/staging/tidspbridge/dynload/reloc.c @@ -45,7 +45,7 @@ static const char bsssymbol[] = { ".bss" }; * Effect: * Extracts the specified field and returns it. ************************************************************************* */ -rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t * data, int fieldsz, +rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t *data, int fieldsz, int offset, unsigned sgn) { register rvalue objval; @@ -98,7 +98,7 @@ rvalue dload_unpack(struct dload_state *dlthis, tgt_au_t * data, int fieldsz, ************************************************************************* */ static const unsigned char ovf_limit[] = { 1, 2, 2 }; -int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t * data, +int dload_repack(struct dload_state *dlthis, rvalue val, tgt_au_t *data, int fieldsz, int offset, unsigned sgn) { register urvalue objval, mask; @@ -161,7 +161,7 @@ static const u8 c60_scale[SCALE_MASK + 1] = { * Effect: * Performs the specified relocation operation ************************************************************************* */ -void dload_relocate(struct dload_state *dlthis, tgt_au_t * data, +void dload_relocate(struct dload_state *dlthis, tgt_au_t *data, struct reloc_record_t *rp, bool *tramps_generated, bool second_pass) { diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c index 701a11ac676d..e6f31d817d6b 100644 --- a/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -471,7 +471,7 @@ err1: return err; } -static int __devinit omap34_xx_bridge_probe(struct platform_device *pdev) +static int omap34_xx_bridge_probe(struct platform_device *pdev) { int err; dev_t dev = 0; @@ -527,7 +527,7 @@ err1: return err; } -static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev) +static int omap34_xx_bridge_remove(struct platform_device *pdev) { dev_t devno; int status = 0; @@ -606,7 +606,7 @@ static struct platform_driver bridge_driver = { .name = "omap-dsp", }, .probe = omap34_xx_bridge_probe, - .remove = __devexit_p(omap34_xx_bridge_remove), + .remove = omap34_xx_bridge_remove, #ifdef CONFIG_PM .suspend = bridge_suspend, .resume = bridge_resume, |