On 18 May 2015 at 15:39, Simon Glass <s...@chromium.org> wrote: > On 15 May 2015 at 19:33, Bin Meng <bmeng...@gmail.com> wrote: >> Eliminate the following build warning in atapi_inquiry(): >> "warning: assignment from incompatible pointer type [enabled by default]" >> >> Signed-off-by: Bin Meng <bmeng...@gmail.com> >> >> --- >> >> Changes in v2: >> - Correct the typo of 'Eliminate' in the commit message >> >> common/cmd_ide.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/common/cmd_ide.c b/common/cmd_ide.c >> index 04a6d9b..ecd3e9d 100644 >> --- a/common/cmd_ide.c >> +++ b/common/cmd_ide.c >> @@ -79,7 +79,7 @@ static void ident_cpy (unsigned char *dest, unsigned char >> *src, unsigned int len >> >> #ifdef CONFIG_ATAPI >> static void atapi_inquiry(block_dev_desc_t *dev_desc); >> -static ulong atapi_read(int device, ulong blknr, lbaint_t blkcnt, >> +static ulong atapi_read(int device, lbaint_t blknr, lbaint_t blkcnt, >> void *buffer); >> #endif >> >> @@ -1388,13 +1388,13 @@ static void atapi_inquiry(block_dev_desc_t *dev_desc) >> #define ATAPI_READ_BLOCK_SIZE 2048 /* assuming CD part */ >> #define ATAPI_READ_MAX_BLOCK (ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE) >> >> -ulong atapi_read(int device, ulong blknr, lbaint_t blkcnt, void *buffer) >> +ulong atapi_read(int device, lbaint_t blknr, lbaint_t blkcnt, void *buffer) >> { >> ulong n = 0; >> unsigned char ccb[12]; /* Command descriptor block */ >> ulong cnt; >> >> - debug("atapi_read dev %d start %lX, blocks " LBAF " buffer at %lX\n", >> + debug("atapi_read dev %d start " LBAF " blocks " LBAF " buffer at >> %lX\n", >> device, blknr, blkcnt, (ulong) buffer); >> >> do { >> -- >> 1.8.2.1 >> > > Acked-by: Simon Glass <s...@chromium.org>
Applied to u-boot-x86, thanks! _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot