Skip to content

Commit 91b12b2

Browse files
committed
PCI/PTM: Move pci_ptm_info() body into its only caller
pci_ptm_info() is simple and is only called by pci_enable_ptm(). Move the entire body there. No functional change intended. Link: https://lore.kernel.org/r/[email protected] Tested-by: Rajvi Jingar <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]> Reviewed-by: Mika Westerberg <[email protected]>
1 parent e8bdc5e commit 91b12b2

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

drivers/pci/pcie/ptm.c

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,6 @@
99
#include <linux/pci.h>
1010
#include "../pci.h"
1111

12-
static void pci_ptm_info(struct pci_dev *dev)
13-
{
14-
char clock_desc[8];
15-
16-
switch (dev->ptm_granularity) {
17-
case 0:
18-
snprintf(clock_desc, sizeof(clock_desc), "unknown");
19-
break;
20-
case 255:
21-
snprintf(clock_desc, sizeof(clock_desc), ">254ns");
22-
break;
23-
default:
24-
snprintf(clock_desc, sizeof(clock_desc), "%uns",
25-
dev->ptm_granularity);
26-
break;
27-
}
28-
pci_info(dev, "PTM enabled%s, %s granularity\n",
29-
dev->ptm_root ? " (root)" : "", clock_desc);
30-
}
31-
3212
static void __pci_disable_ptm(struct pci_dev *dev)
3313
{
3414
u16 ptm = dev->ptm_cap;
@@ -213,16 +193,32 @@ static int __pci_enable_ptm(struct pci_dev *dev)
213193
int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
214194
{
215195
int rc;
196+
char clock_desc[8];
216197

217198
rc = __pci_enable_ptm(dev);
218199
if (rc)
219200
return rc;
220201

221202
dev->ptm_enabled = 1;
222-
pci_ptm_info(dev);
223203

224204
if (granularity)
225205
*granularity = dev->ptm_granularity;
206+
207+
switch (dev->ptm_granularity) {
208+
case 0:
209+
snprintf(clock_desc, sizeof(clock_desc), "unknown");
210+
break;
211+
case 255:
212+
snprintf(clock_desc, sizeof(clock_desc), ">254ns");
213+
break;
214+
default:
215+
snprintf(clock_desc, sizeof(clock_desc), "%uns",
216+
dev->ptm_granularity);
217+
break;
218+
}
219+
pci_info(dev, "PTM enabled%s, %s granularity\n",
220+
dev->ptm_root ? " (root)" : "", clock_desc);
221+
226222
return 0;
227223
}
228224
EXPORT_SYMBOL(pci_enable_ptm);

0 commit comments

Comments
 (0)