aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-07-10 03:01:56 +0300
committerPierre Ossman <drzeus@drzeus.cx>2008-07-15 15:47:03 +0200
commitea901300cd8b809285fa5cbced18124f127e0ac6 (patch)
tree20b080416a73c40fa28e83f9dbcb8b4d9c497061
parent62a7573ee9f31d4fdb330b3e68ebf6efaba1d57c (diff)
downloadlinux-2.6.34-ux500-ea901300cd8b809285fa5cbced18124f127e0ac6.tar.gz
sdio: sdio_io.c Fix sparse warnings
Unfold nested macros it creates not readable code and sparse warnings sdio_io.c:190:9: warning: symbol '_min1' shadows an earlier one Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rwxr-xr-xdrivers/mmc/core/sdio_io.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
index 0888df64581..f61fc2d4cd0 100755
--- a/drivers/mmc/core/sdio_io.c
+++ b/drivers/mmc/core/sdio_io.c
@@ -187,11 +187,10 @@ EXPORT_SYMBOL_GPL(sdio_set_block_size);
*/
static inline unsigned int sdio_max_byte_size(struct sdio_func *func)
{
- return min(min(min(
- func->card->host->max_seg_size,
- func->card->host->max_blk_size),
- func->max_blksize),
- 512u); /* maximum size for byte mode */
+ unsigned mval = min(func->card->host->max_seg_size,
+ func->card->host->max_blk_size);
+ mval = min(mval, func->max_blksize);
+ return min(mval, 512u); /* maximum size for byte mode */
}
/**