summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-05-16 09:33:17 +0800
committerSimon Glass <sjg@chromium.org>2015-06-04 02:39:39 -0600
commit77c2b210c70614383ca83b83be60f04bf14db0c4 (patch)
tree9a045d22812e58d0909d9111487eaafbe9382c86 /common
parent04e3c4eb930a761b561cb87f964aa8a5d694c501 (diff)
downloadtalos-obmc-uboot-77c2b210c70614383ca83b83be60f04bf14db0c4.tar.gz
talos-obmc-uboot-77c2b210c70614383ca83b83be60f04bf14db0c4.zip
cmd_ide: Eliminate build warnings in atapi_inquiry()
Eliminate the following build warning in atapi_inquiry(): "warning: assignment from incompatible pointer type [enabled by default]" Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_ide.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 04a6d9b398..ecd3e9d64f 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 {
OpenPOWER on IntegriCloud