diff options
| author | Igor Grinberg <grinberg@compulab.co.il> | 2011-12-12 12:08:33 +0200 |
|---|---|---|
| committer | Remy Bohmer <linux@bohmer.net> | 2011-12-16 21:03:37 +0100 |
| commit | 4256101f8ca908438ddbb5bd649274dbfd936f22 (patch) | |
| tree | e5b0f8d168ee0f999f9ea06042b08c75cec6d5e6 | |
| parent | 1113a79b2a31a9051b3a1afd3edbbdf013f88833 (diff) | |
| download | u-boot-imx-4256101f8ca908438ddbb5bd649274dbfd936f22.zip u-boot-imx-4256101f8ca908438ddbb5bd649274dbfd936f22.tar.gz u-boot-imx-4256101f8ca908438ddbb5bd649274dbfd936f22.tar.bz2 | |
USB: ULPI: clean a mixup of return types
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>
| -rw-r--r-- | drivers/usb/ulpi/ulpi-viewport.c | 4 | ||||
| -rw-r--r-- | drivers/usb/ulpi/ulpi.c | 8 | ||||
| -rw-r--r-- | include/usb/ulpi.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c index fa2e004..490fb0e 100644 --- a/drivers/usb/ulpi/ulpi-viewport.c +++ b/drivers/usb/ulpi/ulpi-viewport.c @@ -98,7 +98,7 @@ static int ulpi_request(u32 ulpi_viewport, u32 value) 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); @@ -107,7 +107,7 @@ u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value) u32 ulpi_read(u32 ulpi_viewport, u8 *reg) { - u32 err; + int err; u32 val = ULPI_RWRUN | ((u32)reg << 16); err = ulpi_request(ulpi_viewport, val); diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c index 1371aa6..f3f293f 100644 --- a/drivers/usb/ulpi/ulpi.c +++ b/drivers/usb/ulpi/ulpi.c @@ -39,8 +39,8 @@ static struct ulpi_regs *ulpi = (struct ulpi_regs *)0; static int ulpi_integrity_check(u32 ulpi_viewport) { - u32 err, val, tval = ULPI_TEST_VALUE; - int i; + u32 val, tval = ULPI_TEST_VALUE; + int err, i; /* Use the 'special' test value to check all bits */ 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) { - u32 err; + int err; err = ulpi_write(ulpi_viewport, &ulpi->function_ctrl_clear, ULPI_FC_SUSPENDM); @@ -214,7 +214,7 @@ int ulpi_reset_wait(u32) __attribute__((weak, alias("__ulpi_reset_wait"))); int ulpi_reset(u32 ulpi_viewport) { - u32 err; + int err; err = ulpi_write(ulpi_viewport, &ulpi->function_ctrl_set, ULPI_FC_RESET); diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index dc78a59..802f077 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -108,7 +108,7 @@ int ulpi_reset(u32 ulpi_viewport); * * 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. |