diff options
author | Levente Kurusa <levex@linux.com> | 2013-10-29 15:01:46 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-11-22 17:21:10 -0500 |
commit | 462098b090897fbcf00088b225eb7a3adc407e98 (patch) | |
tree | 5eb3e3b5f30e0103f30b32e93ccdf3230089f4c4 /drivers/ata | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
ata: libata-eh: Remove unnecessary snprintf arithmetic
Remove an unnecessary arithmetic operation from a call to snprintf, because
the size parameter of snprintf includes the trailing null space.
Also, initialize the buffer on definition instead of a memset call.
Signed-off-by: Levente Kurusa <levex@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/libata-eh.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 92d7797223be..6d8757008318 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -2402,7 +2402,7 @@ static void ata_eh_link_report(struct ata_link *link) | |||
2402 | struct ata_port *ap = link->ap; | 2402 | struct ata_port *ap = link->ap; |
2403 | struct ata_eh_context *ehc = &link->eh_context; | 2403 | struct ata_eh_context *ehc = &link->eh_context; |
2404 | const char *frozen, *desc; | 2404 | const char *frozen, *desc; |
2405 | char tries_buf[6]; | 2405 | char tries_buf[6] = ""; |
2406 | int tag, nr_failed = 0; | 2406 | int tag, nr_failed = 0; |
2407 | 2407 | ||
2408 | if (ehc->i.flags & ATA_EHI_QUIET) | 2408 | if (ehc->i.flags & ATA_EHI_QUIET) |
@@ -2433,9 +2433,8 @@ static void ata_eh_link_report(struct ata_link *link) | |||
2433 | if (ap->pflags & ATA_PFLAG_FROZEN) | 2433 | if (ap->pflags & ATA_PFLAG_FROZEN) |
2434 | frozen = " frozen"; | 2434 | frozen = " frozen"; |
2435 | 2435 | ||
2436 | memset(tries_buf, 0, sizeof(tries_buf)); | ||
2437 | if (ap->eh_tries < ATA_EH_MAX_TRIES) | 2436 | if (ap->eh_tries < ATA_EH_MAX_TRIES) |
2438 | snprintf(tries_buf, sizeof(tries_buf) - 1, " t%d", | 2437 | snprintf(tries_buf, sizeof(tries_buf), " t%d", |
2439 | ap->eh_tries); | 2438 | ap->eh_tries); |
2440 | 2439 | ||
2441 | if (ehc->i.dev) { | 2440 | if (ehc->i.dev) { |