From: Jan Höppner Date: Tue, 29 May 2018 12:11:25 +0000 (+0200) Subject: s390/dasd: Use ALIGN_DOWN macro X-Git-Tag: v5.3-rc1~113^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b54441534e9648f8df24b75a63bb00ed3aa123de;p=thirdparty%2Fkernel%2Flinux.git s390/dasd: Use ALIGN_DOWN macro There is now an ALIGN_DOWN macro available. Let's rather use kernel provided macros that do the things we want. Signed-off-by: Jan Höppner Reviewed-by: Stefan Haberland Signed-off-by: Vasily Gorbik --- diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index 79fbe0d68a8d9..cbb770824226f 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c @@ -794,7 +794,7 @@ static void dasd_fba_setup_blk_queue(struct dasd_block *block) /* Calculate max_discard_sectors and make it PAGE aligned */ max_bytes = USHRT_MAX * logical_block_size; - max_bytes = ALIGN(max_bytes, PAGE_SIZE) - PAGE_SIZE; + max_bytes = ALIGN_DOWN(max_bytes, PAGE_SIZE); max_discard_sectors = max_bytes / logical_block_size; blk_queue_max_discard_sectors(q, max_discard_sectors);