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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
parent
1c971f39e6
commit
5e791d2e47
|
@ -154,17 +154,14 @@ int register_parisc_driver(struct parisc_driver *driver)
|
||||||
{
|
{
|
||||||
/* FIXME: we need this because apparently the sti
|
/* FIXME: we need this because apparently the sti
|
||||||
* driver can be registered twice */
|
* driver can be registered twice */
|
||||||
if(driver->drv.name) {
|
if (driver->drv.name) {
|
||||||
printk(KERN_WARNING
|
pr_warn("BUG: skipping previously registered driver %s\n",
|
||||||
"BUG: skipping previously registered driver %s\n",
|
driver->name);
|
||||||
driver->name);
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!driver->probe) {
|
if (!driver->probe) {
|
||||||
printk(KERN_WARNING
|
pr_warn("BUG: driver %s has no probe routine\n", driver->name);
|
||||||
"BUG: driver %s has no probe routine\n",
|
|
||||||
driver->name);
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -491,12 +488,9 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
|
||||||
|
|
||||||
dev = create_parisc_device(mod_path);
|
dev = create_parisc_device(mod_path);
|
||||||
if (dev->id.hw_type != HPHW_FAULTY) {
|
if (dev->id.hw_type != HPHW_FAULTY) {
|
||||||
printk(KERN_ERR "Two devices have hardware path [%s]. "
|
pr_err("Two devices have hardware path [%s]. IODC data for second device: %7phN\n"
|
||||||
"IODC data for second device: "
|
"Rearranging GSC cards sometimes helps\n",
|
||||||
"%02x%02x%02x%02x%02x%02x\n"
|
parisc_pathname(dev), iodc_data);
|
||||||
"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]);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -528,8 +522,7 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
|
||||||
* the keyboard controller
|
* the keyboard controller
|
||||||
*/
|
*/
|
||||||
if ((hpa & 0xfff) == 0 && insert_resource(&iomem_resource, &dev->hpa))
|
if ((hpa & 0xfff) == 0 && insert_resource(&iomem_resource, &dev->hpa))
|
||||||
printk("Unable to claim HPA %lx for device %s\n",
|
pr_warn("Unable to claim HPA %lx for device %s\n", hpa, name);
|
||||||
hpa, name);
|
|
||||||
|
|
||||||
return dev;
|
return dev;
|
||||||
}
|
}
|
||||||
|
@ -875,7 +868,7 @@ static void print_parisc_device(struct parisc_device *dev)
|
||||||
static int count;
|
static int count;
|
||||||
|
|
||||||
print_pa_hwpath(dev, hw_path);
|
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,
|
++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,
|
||||||
dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);
|
dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue