Commit d75f773c authored by Sakari Ailus's avatar Sakari Ailus Committed by Petr Mladek
Browse files

treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively 

%pF and %pf are functionally equivalent to %pS and %ps conversion
specifiers. The former are deprecated, therefore switch the current users
to use the preferred variant.

The changes have been produced by the following command:

	git grep -l '%p[fF]' | grep -v '^\(tools\|Documentation\)/' | \
	while read i; do perl -i -pe 's/%pf/%ps/g; s/%pF/%pS/g;' $i; done

And verifying the result.

Link: http://lkml.kernel.org/r/20190325193229.23390-1-sakari.ailus@linux.intel.com


Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: sparclinux@vger.kernel.org
Cc: linux-um@lists.infradead.org
Cc: xen-devel@lists.xenproject.org
Cc: linux-acpi@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: drbd-dev@lists.linbit.com
Cc: linux-block@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-nvdimm@lists.01.org
Cc: linux-pci@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org
Cc: linux-f2fs-devel@lists.sourceforge.net
Cc: linux-mm@kvack.org
Cc: ceph-devel@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: David Sterba <dsterba@suse.com> (for btrfs)
Acked-by: Mike Rapoport <rppt@linux.ibm.com> (for mm/memblock.c)
Acked-by: Bjorn Helgaas <bhelgaas@google.com> (for drivers/pci)
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent c4703acd

arch/alpha/kernel/pci_iommu.c

+10 −10
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) 
		ok = 0;



	/* If both conditions above are met, we are fine. */

	DBGA("pci_dac_dma_supported %s from %pf\n",

	DBGA("pci_dac_dma_supported %s from %ps\n",

	     ok ? "yes" : "no", __builtin_return_address(0));



	return ok;
@@ -269,7 +269,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, 
	    && paddr + size <= __direct_map_size) {

		ret = paddr + __direct_map_base;



		DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %pf\n",

		DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %ps\n",

		      cpu_addr, size, ret, __builtin_return_address(0));



		return ret;
@@ -280,7 +280,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, 
	if (dac_allowed) {

		ret = paddr + alpha_mv.pci_dac_offset;



		DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %pf\n",

		DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %ps\n",

		      cpu_addr, size, ret, __builtin_return_address(0));



		return ret;
@@ -317,7 +317,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, 
	ret = arena->dma_base + dma_ofs * PAGE_SIZE;

	ret += (unsigned long)cpu_addr & ~PAGE_MASK;



	DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %pf\n",

	DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %ps\n",

	      cpu_addr, size, npages, ret, __builtin_return_address(0));



	return ret;
@@ -384,14 +384,14 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, 
	    && dma_addr < __direct_map_base + __direct_map_size) {

		/* Nothing to do.  */



		DBGA2("pci_unmap_single: direct [%llx,%zx] from %pf\n",

		DBGA2("pci_unmap_single: direct [%llx,%zx] from %ps\n",

		      dma_addr, size, __builtin_return_address(0));



		return;

	}



	if (dma_addr > 0xffffffff) {

		DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %pf\n",

		DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %ps\n",

		      dma_addr, size, __builtin_return_address(0));

		return;

	}
@@ -423,7 +423,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, 


	spin_unlock_irqrestore(&arena->lock, flags);



	DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %pf\n",

	DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %ps\n",

	      dma_addr, size, npages, __builtin_return_address(0));

}
@@ -446,7 +446,7 @@ try_again: 
	cpu_addr = (void *)__get_free_pages(gfp | __GFP_ZERO, order);

	if (! cpu_addr) {

		printk(KERN_INFO "pci_alloc_consistent: "

		       "get_free_pages failed from %pf\n",

		       "get_free_pages failed from %ps\n",

			__builtin_return_address(0));

		/* ??? Really atomic allocation?  Otherwise we could play

		   with vmalloc and sg if we can't find contiguous memory.  */
@@ -465,7 +465,7 @@ try_again: 
		goto try_again;

	}



	DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %pf\n",

	DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %ps\n",

	      size, cpu_addr, *dma_addrp, __builtin_return_address(0));



	return cpu_addr;
@@ -485,7 +485,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size, 
	pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);

	free_pages((unsigned long)cpu_addr, get_order(size));



	DBGA2("pci_free_consistent: [%llx,%zx] from %pf\n",

	DBGA2("pci_free_consistent: [%llx,%zx] from %ps\n",

	      dma_addr, size, __builtin_return_address(0));

}

arch/arm/mach-imx/pm-imx6.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static void imx6_pm_stby_poweroff(void) 
static int imx6_pm_stby_poweroff_probe(void)

{

	if (pm_power_off) {

		pr_warn("%s: pm_power_off already claimed  %p %pf!\n",

		pr_warn("%s: pm_power_off already claimed  %p %ps!\n",

			__func__, pm_power_off, pm_power_off);

		return -EBUSY;

	}

arch/arm/mm/alignment.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static const char *usermode_action[] = { 
static int alignment_proc_show(struct seq_file *m, void *v)

{

	seq_printf(m, "User:\t\t%lu\n", ai_user);

	seq_printf(m, "System:\t\t%lu (%pF)\n", ai_sys, ai_sys_last_pc);

	seq_printf(m, "System:\t\t%lu (%pS)\n", ai_sys, ai_sys_last_pc);

	seq_printf(m, "Skipped:\t%lu\n", ai_skipped);

	seq_printf(m, "Half:\t\t%lu\n", ai_half);

	seq_printf(m, "Word:\t\t%lu\n", ai_word);

arch/arm/nwfpe/fpmodule.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void float_raise(signed char flags) 
#ifdef CONFIG_DEBUG_USER

	if (flags & debug)

 		printk(KERN_DEBUG

		       "NWFPE: %s[%d] takes exception %08x at %pf from %08lx\n",

		       "NWFPE: %s[%d] takes exception %08x at %ps from %08lx\n",

		       current->comm, current->pid, flags,

		       __builtin_return_address(0), GET_USERREG()->ARM_pc);

#endif

arch/microblaze/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size, 
		p >= memory_start && p < virt_to_phys(high_memory) &&

		!(p >= __virt_to_phys((phys_addr_t)__bss_stop) &&

		p < __virt_to_phys((phys_addr_t)__bss_stop))) {

		pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n",

		pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %ps\n",

			(unsigned long)p, __builtin_return_address(0));

		return NULL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE