diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-05-26 12:11:28 +0200 |
|---|---|---|
| committer | Macpaul Lin <macpaul@gmail.com> | 2013-07-24 11:49:17 +0800 |
| commit | c575180bae9b6baa8aa06e832f81ff41264f5707 (patch) | |
| tree | ea99164e478826612e12f5c7b4816a9aefea0d65 | |
| parent | dbb713baa608d3397e56bc32b26d2efe07c756ee (diff) | |
| download | u-boot-imx-c575180bae9b6baa8aa06e832f81ff41264f5707.zip u-boot-imx-c575180bae9b6baa8aa06e832f81ff41264f5707.tar.gz u-boot-imx-c575180bae9b6baa8aa06e832f81ff41264f5707.tar.bz2 | |
block: constify sect_buf argument of ide_write_data
Add a const keyword to the sect_buf argument of
ide_write_data to fix the following warning:
cmd_ide.c: In function '__ide_output_data':
cmd_ide.c:548: warning: passing argument 2 of 'ide_write_data' discards qualifiers from pointer target type
/devel/u-boot.git/include/ide.h:76: note: expected 'ulong *' but argument is of type 'const ulong *'
Also modify the driver-model documentation to
match with the new prototype.
Compile tested only.
Cc: Macpaul Lin <macpaul@andestech.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
| -rw-r--r-- | doc/driver-model/UDM-block.txt | 2 | ||||
| -rw-r--r-- | drivers/block/ftide020.c | 2 | ||||
| -rw-r--r-- | include/ide.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/driver-model/UDM-block.txt b/doc/driver-model/UDM-block.txt index 5d5c776..b42ec69 100644 --- a/doc/driver-model/UDM-block.txt +++ b/doc/driver-model/UDM-block.txt @@ -93,7 +93,7 @@ I) Overview uchar ide_read_register(int dev, unsigned int port); void ide_write_register(int dev, unsigned int port, unsigned char val); void ide_read_data(int dev, ulong *sect_buf, int words); - void ide_write_data(int dev, ulong *sect_buf, int words); + void ide_write_data(int dev, const ulong *sect_buf, int words); The first two functions are called from ide_inb()/ide_outb(), and will default to direct memory access if CONFIG_IDE_AHB is not set, or diff --git a/drivers/block/ftide020.c b/drivers/block/ftide020.c index ad8fdad..61900ba 100644 --- a/drivers/block/ftide020.c +++ b/drivers/block/ftide020.c @@ -81,7 +81,7 @@ void ide_write_register(int dev, unsigned int port, unsigned char val) IDE_REG_DA_WRITE(port) | val); } -void ide_write_data(int dev, ulong *sect_buf, int words) +void ide_write_data(int dev, const ulong *sect_buf, int words) { static struct ftide020_s *ftide020 = (struct ftide020_s *) FTIDE_BASE; diff --git a/include/ide.h b/include/ide.h index 59ea975..0269d51 100644 --- a/include/ide.h +++ b/include/ide.h @@ -76,7 +76,7 @@ int ide_device_present(int dev); unsigned char ide_read_register(int dev, unsigned int port); void ide_write_register(int dev, unsigned int port, unsigned char val); void ide_read_data(int dev, ulong *sect_buf, int words); -void ide_write_data(int dev, ulong *sect_buf, int words); +void ide_write_data(int dev, const ulong *sect_buf, int words); #endif /* |