Skip to content

Commit

Permalink
Merge branch 'sparc-scnprintf'
Browse files Browse the repository at this point in the history
Chen Zhou says:

====================
sparc: use scnprintf() in show() methods

snprintf() returns the number of bytes that would be written,
which may be greater than the the actual length to be written.

show() methods should return the number of bytes printed into the
buffer. This is the return value of scnprintf().
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed May 13, 2020
2 parents 9ef391b + 117e2cb commit fcdf818
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/sparc/kernel/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char *
pdev = to_pci_dev(dev);
dp = pdev->dev.of_node;

return snprintf (buf, PAGE_SIZE, "%pOF\n", dp);
return scnprintf(buf, PAGE_SIZE, "%pOF\n", dp);
}

static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_pciobppath_attr, NULL);
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc/kernel/vio.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ show_pciobppath_attr(struct device *dev, struct device_attribute *attr,
vdev = to_vio_dev(dev);
dp = vdev->dp;

return snprintf (buf, PAGE_SIZE, "%pOF\n", dp);
return scnprintf(buf, PAGE_SIZE, "%pOF\n", dp);
}

static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH,
Expand Down

0 comments on commit fcdf818

Please sign in to comment.