Commit 23e4c67a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Tejun Heo

ata: avoid gcc-7 warning in ata_timing_quantize

gcc-7 warns about the result of a constant multiplication used as
a boolean:

drivers/ata/libata-core.c: In function 'ata_timing_quantize':
drivers/ata/libata-core.c:3164:30: warning: '*' in boolean context, suggest '&&' instead [-Wint-in-bool-context]

This slightly rearranges the macro to simplify the code and avoid
the warning at the same time.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent c0da4fa0
...@@ -3234,19 +3234,19 @@ static const struct ata_timing ata_timing[] = { ...@@ -3234,19 +3234,19 @@ static const struct ata_timing ata_timing[] = {
}; };
#define ENOUGH(v, unit) (((v)-1)/(unit)+1) #define ENOUGH(v, unit) (((v)-1)/(unit)+1)
#define EZ(v, unit) ((v)?ENOUGH(v, unit):0) #define EZ(v, unit) ((v)?ENOUGH(((v) * 1000), unit):0)
static void ata_timing_quantize(const struct ata_timing *t, struct ata_timing *q, int T, int UT) static void ata_timing_quantize(const struct ata_timing *t, struct ata_timing *q, int T, int UT)
{ {
q->setup = EZ(t->setup * 1000, T); q->setup = EZ(t->setup, T);
q->act8b = EZ(t->act8b * 1000, T); q->act8b = EZ(t->act8b, T);
q->rec8b = EZ(t->rec8b * 1000, T); q->rec8b = EZ(t->rec8b, T);
q->cyc8b = EZ(t->cyc8b * 1000, T); q->cyc8b = EZ(t->cyc8b, T);
q->active = EZ(t->active * 1000, T); q->active = EZ(t->active, T);
q->recover = EZ(t->recover * 1000, T); q->recover = EZ(t->recover, T);
q->dmack_hold = EZ(t->dmack_hold * 1000, T); q->dmack_hold = EZ(t->dmack_hold, T);
q->cycle = EZ(t->cycle * 1000, T); q->cycle = EZ(t->cycle, T);
q->udma = EZ(t->udma * 1000, UT); q->udma = EZ(t->udma, UT);
} }
void ata_timing_merge(const struct ata_timing *a, const struct ata_timing *b, void ata_timing_merge(const struct ata_timing *a, const struct ata_timing *b,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment