From: "Krzysztof Wilczyński" <kw@linux.com> To: Bjorn Helgaas <bhelgaas@google.com> Cc: "Oliver O'Halloran" <oohall@gmail.com>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Tyrel Datwyler <tyreld@linux.ibm.com>, Russell Currey <ruscur@russell.cc>, Kurt Schwemmer <kurt.schwemmer@microsemi.com>, Logan Gunthorpe <logang@deltatee.com>, linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 06/11] PCI/P2PDMA: Use sysfs_emit() and sysfs_emit_at() in "show" functions Date: Mon, 10 May 2021 04:14:19 +0000 [thread overview] Message-ID: <20210510041424.233565-6-kw@linux.com> (raw) In-Reply-To: <20210510041424.233565-1-kw@linux.com> The sysfs_emit() and sysfs_emit_at() functions were introduced to make it less ambiguous which function is preferred when writing to the output buffer in a device attribute's "show" callback [1]. Convert the PCI sysfs object "show" functions from sprintf(), snprintf() and scnprintf() to sysfs_emit() and sysfs_emit_at() accordingly, as the latter is aware of the PAGE_SIZE buffer and correctly returns the number of bytes written into the buffer. No functional change intended. [1] Documentation/filesystems/sysfs.rst Related to: commit ad025f8e46f3 ("PCI/sysfs: Use sysfs_emit() and sysfs_emit_at() in "show" functions") Signed-off-by: Krzysztof Wilczyński <kw@linux.com> --- drivers/pci/p2pdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 196382630363..a1351b3e2c4c 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -53,7 +53,7 @@ static ssize_t size_show(struct device *dev, struct device_attribute *attr, if (pdev->p2pdma->pool) size = gen_pool_size(pdev->p2pdma->pool); - return scnprintf(buf, PAGE_SIZE, "%zd\n", size); + return sysfs_emit(buf, "%zd\n", size); } static DEVICE_ATTR_RO(size); @@ -66,7 +66,7 @@ static ssize_t available_show(struct device *dev, struct device_attribute *attr, if (pdev->p2pdma->pool) avail = gen_pool_avail(pdev->p2pdma->pool); - return scnprintf(buf, PAGE_SIZE, "%zd\n", avail); + return sysfs_emit(buf, "%zd\n", avail); } static DEVICE_ATTR_RO(available); @@ -75,8 +75,7 @@ static ssize_t published_show(struct device *dev, struct device_attribute *attr, { struct pci_dev *pdev = to_pci_dev(dev); - return scnprintf(buf, PAGE_SIZE, "%d\n", - pdev->p2pdma->p2pmem_published); + return sysfs_emit(buf, "%d\n", pdev->p2pdma->p2pmem_published); } static DEVICE_ATTR_RO(published); -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: "Krzysztof Wilczyński" <kw@linux.com> To: Bjorn Helgaas <bhelgaas@google.com> Cc: Tyrel Datwyler <tyreld@linux.ibm.com>, linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Oliver O'Halloran <oohall@gmail.com>, Paul Mackerras <paulus@samba.org>, Kurt Schwemmer <kurt.schwemmer@microsemi.com>, Logan Gunthorpe <logang@deltatee.com> Subject: [PATCH 06/11] PCI/P2PDMA: Use sysfs_emit() and sysfs_emit_at() in "show" functions Date: Mon, 10 May 2021 04:14:19 +0000 [thread overview] Message-ID: <20210510041424.233565-6-kw@linux.com> (raw) In-Reply-To: <20210510041424.233565-1-kw@linux.com> The sysfs_emit() and sysfs_emit_at() functions were introduced to make it less ambiguous which function is preferred when writing to the output buffer in a device attribute's "show" callback [1]. Convert the PCI sysfs object "show" functions from sprintf(), snprintf() and scnprintf() to sysfs_emit() and sysfs_emit_at() accordingly, as the latter is aware of the PAGE_SIZE buffer and correctly returns the number of bytes written into the buffer. No functional change intended. [1] Documentation/filesystems/sysfs.rst Related to: commit ad025f8e46f3 ("PCI/sysfs: Use sysfs_emit() and sysfs_emit_at() in "show" functions") Signed-off-by: Krzysztof Wilczyński <kw@linux.com> --- drivers/pci/p2pdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 196382630363..a1351b3e2c4c 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -53,7 +53,7 @@ static ssize_t size_show(struct device *dev, struct device_attribute *attr, if (pdev->p2pdma->pool) size = gen_pool_size(pdev->p2pdma->pool); - return scnprintf(buf, PAGE_SIZE, "%zd\n", size); + return sysfs_emit(buf, "%zd\n", size); } static DEVICE_ATTR_RO(size); @@ -66,7 +66,7 @@ static ssize_t available_show(struct device *dev, struct device_attribute *attr, if (pdev->p2pdma->pool) avail = gen_pool_avail(pdev->p2pdma->pool); - return scnprintf(buf, PAGE_SIZE, "%zd\n", avail); + return sysfs_emit(buf, "%zd\n", avail); } static DEVICE_ATTR_RO(available); @@ -75,8 +75,7 @@ static ssize_t published_show(struct device *dev, struct device_attribute *attr, { struct pci_dev *pdev = to_pci_dev(dev); - return scnprintf(buf, PAGE_SIZE, "%d\n", - pdev->p2pdma->p2pmem_published); + return sysfs_emit(buf, "%d\n", pdev->p2pdma->p2pmem_published); } static DEVICE_ATTR_RO(published); -- 2.31.1
next prev parent reply other threads:[~2021-05-10 4:14 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-10 4:14 [PATCH 01/11] PCI: Use sysfs_emit() and sysfs_emit_at() in "show" functions Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 02/11] PCI/AER: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 03/11] PCI: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 04/11] PCI/MSI: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 05/11] PCI/IOV: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński [this message] 2021-05-10 4:14 ` [PATCH 06/11] PCI/P2PDMA: " Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 07/11] PCI/ASPM: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 08/11] PCI: switchtec: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 09/11] PCI: rpadlpar: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 10/11] PCI: hotplug: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 4:14 ` [PATCH 11/11] PCI: shpchp: " Krzysztof Wilczyński 2021-05-10 4:14 ` Krzysztof Wilczyński 2021-05-10 10:30 ` [PATCH 01/11] PCI: " Krzysztof Wilczyński 2021-05-10 10:30 ` Krzysztof Wilczyński 2021-05-10 15:57 ` Logan Gunthorpe 2021-05-10 15:57 ` Logan Gunthorpe 2021-05-13 12:49 ` Krzysztof Wilczyński 2021-05-13 12:49 ` Krzysztof Wilczyński
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210510041424.233565-6-kw@linux.com \ --to=kw@linux.com \ --cc=benh@kernel.crashing.org \ --cc=bhelgaas@google.com \ --cc=kurt.schwemmer@microsemi.com \ --cc=linux-pci@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=logang@deltatee.com \ --cc=mpe@ellerman.id.au \ --cc=oohall@gmail.com \ --cc=paulus@samba.org \ --cc=ruscur@russell.cc \ --cc=tyreld@linux.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.