Skip to content

Commit

Permalink
ata: libata-eh: Remove unnecessary snprintf arithmetic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Levente Kurusa authored and Tejun Heo committed Nov 22, 2013
1 parent 6ce4eac commit 462098b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/ata/libata-eh.c
Original file line number Diff line number Diff line change
Expand Up @@ -2402,7 +2402,7 @@ static void ata_eh_link_report(struct ata_link *link)
struct ata_port *ap = link->ap;
struct ata_eh_context *ehc = &link->eh_context;
const char *frozen, *desc;
char tries_buf[6];
char tries_buf[6] = "";
int tag, nr_failed = 0;

if (ehc->i.flags & ATA_EHI_QUIET)
Expand Down Expand Up @@ -2433,9 +2433,8 @@ static void ata_eh_link_report(struct ata_link *link)
if (ap->pflags & ATA_PFLAG_FROZEN)
frozen = " frozen";

memset(tries_buf, 0, sizeof(tries_buf));
if (ap->eh_tries < ATA_EH_MAX_TRIES)
snprintf(tries_buf, sizeof(tries_buf) - 1, " t%d",
snprintf(tries_buf, sizeof(tries_buf), " t%d",
ap->eh_tries);

if (ehc->i.dev) {
Expand Down

0 comments on commit 462098b

Please sign in to comment.