Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e791d2e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Helge Deller
Browse files

parisc: Convert printk(KERN_LEVEL) to pr_lvl() 



Convert printk(KERN_LEVEL) type of calls to pr_lvl() macros.

While here,
  - convert printk() to pr_info()
  - join back string literal to be on one line
  - use %*phN (note, it gives 1 byte more for sake of simplicity)

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 1c971f39

arch/parisc/kernel/drivers.c

+9 −16
Original line number Diff line number Diff line
@@ -155,16 +155,13 @@ int register_parisc_driver(struct parisc_driver *driver) 
	/* FIXME: we need this because apparently the sti

	 * driver can be registered twice */

	if (driver->drv.name) {

		printk(KERN_WARNING 

		       "BUG: skipping previously registered driver %s\n",

		pr_warn("BUG: skipping previously registered driver %s\n",

			driver->name);

		return 1;

	}



	if (!driver->probe) {

		printk(KERN_WARNING 

		       "BUG: driver %s has no probe routine\n",

		       driver->name);

		pr_warn("BUG: driver %s has no probe routine\n", driver->name);

		return 1;

	}
@@ -491,12 +488,9 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) 


	dev = create_parisc_device(mod_path);

	if (dev->id.hw_type != HPHW_FAULTY) {

		printk(KERN_ERR "Two devices have hardware path [%s].  "

				"IODC data for second device: "

				"%02x%02x%02x%02x%02x%02x\n"

		pr_err("Two devices have hardware path [%s].  IODC data for second device: %7phN\n"

		       "Rearranging GSC cards sometimes helps\n",

			parisc_pathname(dev), iodc_data[0], iodc_data[1],

			iodc_data[3], iodc_data[4], iodc_data[5], iodc_data[6]);

			parisc_pathname(dev), iodc_data);

		return NULL;

	}
@@ -528,8 +522,7 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) 
	 * the keyboard controller

	 */

	if ((hpa & 0xfff) == 0 && insert_resource(&iomem_resource, &dev->hpa))

		printk("Unable to claim HPA %lx for device %s\n",

				hpa, name);

		pr_warn("Unable to claim HPA %lx for device %s\n", hpa, name);



	return dev;

}
@@ -875,7 +868,7 @@ static void print_parisc_device(struct parisc_device *dev) 
	static int count;



	print_pa_hwpath(dev, hw_path);

	printk(KERN_INFO "%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",

	pr_info("%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",

		++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,

		dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);