minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-15 06:55:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

USB: ULPI: clean a mixup of return types

Browse Source 
Clean a mixup between u32 and int as a return type
for functions returning error values.
Use int as it is native (and widely used) return type.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Igor Grinberg 2011-12-12 12:08:33 +02:00 committed by Remy Bohmer
parent 1113a79b2a
commit 4256101f8c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/ulpi/ulpi-viewport.c
View File

@ -98,7 +98,7 @@ static int ulpi_request(u32 ulpi_viewport, u32 value)
return err; return err;
} }
u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value) int ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value)
{ {
u32 val = ULPI_RWRUN | ULPI_RWCTRL | ((u32)reg << 16) | (value & 0xff); u32 val = ULPI_RWRUN | ULPI_RWCTRL | ((u32)reg << 16) | (value & 0xff);
@ -107,7 +107,7 @@ u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value)
u32 ulpi_read(u32 ulpi_viewport, u8 *reg) u32 ulpi_read(u32 ulpi_viewport, u8 *reg)
{ {
u32 err; int err;
u32 val = ULPI_RWRUN | ((u32)reg << 16); u32 val = ULPI_RWRUN | ((u32)reg << 16);
err = ulpi_request(ulpi_viewport, val); err = ulpi_request(ulpi_viewport, val);

8
drivers/usb/ulpi/ulpi.c
View File

@ -39,8 +39,8 @@ static struct ulpi_regs *ulpi = (struct ulpi_regs *)0;
static int ulpi_integrity_check(u32 ulpi_viewport) static int ulpi_integrity_check(u32 ulpi_viewport)
{ {
u32 err, val, tval = ULPI_TEST_VALUE; u32 val, tval = ULPI_TEST_VALUE;
int i; int err, i;
/* Use the 'special' test value to check all bits */ /* Use the 'special' test value to check all bits */
for (i = 0; i < 2; i++, tval <<= 1) { for (i = 0; i < 2; i++, tval <<= 1) {
@ -171,7 +171,7 @@ int ulpi_serial_mode_enable(u32 ulpi_viewport, unsigned smode)
int ulpi_suspend(u32 ulpi_viewport) int ulpi_suspend(u32 ulpi_viewport)
{ {
u32 err; int err;
err = ulpi_write(ulpi_viewport, &ulpi->function_ctrl_clear, err = ulpi_write(ulpi_viewport, &ulpi->function_ctrl_clear,
ULPI_FC_SUSPENDM); ULPI_FC_SUSPENDM);
@ -214,7 +214,7 @@ int ulpi_reset_wait(u32) __attribute__((weak, alias("__ulpi_reset_wait")));
int ulpi_reset(u32 ulpi_viewport) int ulpi_reset(u32 ulpi_viewport)
{ {
u32 err; int err;
err = ulpi_write(ulpi_viewport, err = ulpi_write(ulpi_viewport,
&ulpi->function_ctrl_set, ULPI_FC_RESET); &ulpi->function_ctrl_set, ULPI_FC_RESET);

2
include/usb/ulpi.h
View File

@ -108,7 +108,7 @@ int ulpi_reset(u32 ulpi_viewport);
* *
* returns 0 on success, ULPI_ERROR on failure. * returns 0 on success, ULPI_ERROR on failure.
*/ */
u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value); int ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value);
/* /*
* Read the ULPI PHY register content via the viewport. * Read the ULPI PHY register content via the viewport.