Commit 4256101f8ca908438ddbb5bd649274dbfd936f22
Committed by
Remy Bohmer
Remy Bohmer
1 parent
1113a79b2a
Exists in
master
and in
54 other branches
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>
Showing 3 changed files with 7 additions and 7 deletions Side-by-side Diff
drivers/usb/ulpi/ulpi-viewport.c
| ... | ... | @@ -98,7 +98,7 @@ |
| 98 | 98 | return err; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | -u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value) | |
| 101 | +int ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value) | |
| 102 | 102 | { |
| 103 | 103 | u32 val = ULPI_RWRUN | ULPI_RWCTRL | ((u32)reg << 16) | (value & 0xff); |
| 104 | 104 | |
| ... | ... | @@ -107,7 +107,7 @@ |
| 107 | 107 | |
| 108 | 108 | u32 ulpi_read(u32 ulpi_viewport, u8 *reg) |
| 109 | 109 | { |
| 110 | - u32 err; | |
| 110 | + int err; | |
| 111 | 111 | u32 val = ULPI_RWRUN | ((u32)reg << 16); |
| 112 | 112 | |
| 113 | 113 | err = ulpi_request(ulpi_viewport, val); |
drivers/usb/ulpi/ulpi.c
| ... | ... | @@ -39,8 +39,8 @@ |
| 39 | 39 | |
| 40 | 40 | static int ulpi_integrity_check(u32 ulpi_viewport) |
| 41 | 41 | { |
| 42 | - u32 err, val, tval = ULPI_TEST_VALUE; | |
| 43 | - int i; | |
| 42 | + u32 val, tval = ULPI_TEST_VALUE; | |
| 43 | + int err, i; | |
| 44 | 44 | |
| 45 | 45 | /* Use the 'special' test value to check all bits */ |
| 46 | 46 | for (i = 0; i < 2; i++, tval <<= 1) { |
| ... | ... | @@ -171,7 +171,7 @@ |
| 171 | 171 | |
| 172 | 172 | int ulpi_suspend(u32 ulpi_viewport) |
| 173 | 173 | { |
| 174 | - u32 err; | |
| 174 | + int err; | |
| 175 | 175 | |
| 176 | 176 | err = ulpi_write(ulpi_viewport, &ulpi->function_ctrl_clear, |
| 177 | 177 | ULPI_FC_SUSPENDM); |
| ... | ... | @@ -214,7 +214,7 @@ |
| 214 | 214 | |
| 215 | 215 | int ulpi_reset(u32 ulpi_viewport) |
| 216 | 216 | { |
| 217 | - u32 err; | |
| 217 | + int err; | |
| 218 | 218 | |
| 219 | 219 | err = ulpi_write(ulpi_viewport, |
| 220 | 220 | &ulpi->function_ctrl_set, ULPI_FC_RESET); |
include/usb/ulpi.h
| ... | ... | @@ -108,7 +108,7 @@ |
| 108 | 108 | * |
| 109 | 109 | * returns 0 on success, ULPI_ERROR on failure. |
| 110 | 110 | */ |
| 111 | -u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value); | |
| 111 | +int ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value); | |
| 112 | 112 | |
| 113 | 113 | /* |
| 114 | 114 | * Read the ULPI PHY register content via the viewport. |