lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 08/10] PCI/PTM: Move pci_ptm_info() body into its only caller
    Date
    From: Bjorn Helgaas <bhelgaas@google.com>

    pci_ptm_info() is simple and is only called by pci_enable_ptm(). Move the
    entire body there.

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    ---
    drivers/pci/pcie/ptm.c | 39 +++++++++++++++++----------------------
    1 file changed, 17 insertions(+), 22 deletions(-)

    diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c
    index 8ac844212436..d65f5af9700d 100644
    --- a/drivers/pci/pcie/ptm.c
    +++ b/drivers/pci/pcie/ptm.c
    @@ -9,26 +9,6 @@
    #include <linux/pci.h>
    #include "../pci.h"

    -static void pci_ptm_info(struct pci_dev *dev)
    -{
    - char clock_desc[8];
    -
    - switch (dev->ptm_granularity) {
    - case 0:
    - snprintf(clock_desc, sizeof(clock_desc), "unknown");
    - break;
    - case 255:
    - snprintf(clock_desc, sizeof(clock_desc), ">254ns");
    - break;
    - default:
    - snprintf(clock_desc, sizeof(clock_desc), "%uns",
    - dev->ptm_granularity);
    - break;
    - }
    - pci_info(dev, "PTM enabled%s, %s granularity\n",
    - dev->ptm_root ? " (root)" : "", clock_desc);
    -}
    -
    static void __pci_disable_ptm(struct pci_dev *dev)
    {
    int ptm = dev->ptm_cap;
    @@ -183,6 +163,7 @@ static int __pci_enable_ptm(struct pci_dev *dev)
    int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
    {
    int rc;
    + char clock_desc[8];

    rc = __pci_enable_ptm(dev);
    if (rc)
    @@ -190,10 +171,24 @@ int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)

    dev->ptm_enabled = 1;

    - pci_ptm_info(dev);
    -
    if (granularity)
    *granularity = dev->ptm_granularity;
    +
    + switch (dev->ptm_granularity) {
    + case 0:
    + snprintf(clock_desc, sizeof(clock_desc), "unknown");
    + break;
    + case 255:
    + snprintf(clock_desc, sizeof(clock_desc), ">254ns");
    + break;
    + default:
    + snprintf(clock_desc, sizeof(clock_desc), "%uns",
    + dev->ptm_granularity);
    + break;
    + }
    + pci_info(dev, "PTM enabled%s, %s granularity\n",
    + dev->ptm_root ? " (root)" : "", clock_desc);
    +
    return 0;
    }
    EXPORT_SYMBOL(pci_enable_ptm);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-09-07 00:25    [W:2.714 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site