From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8835C433F4 for ; Mon, 27 Aug 2018 15:52:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61506208B7 for ; Mon, 27 Aug 2018 15:52:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61506208B7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=perches.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727255AbeH0Tjl (ORCPT ); Mon, 27 Aug 2018 15:39:41 -0400 Received: from smtprelay0183.hostedemail.com ([216.40.44.183]:36485 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727065AbeH0Tjl (ORCPT ); Mon, 27 Aug 2018 15:39:41 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay01.hostedemail.com (Postfix) with ESMTP id 498F9100E86C4; Mon, 27 Aug 2018 15:52:30 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: cats13_15b5f6385bc3e X-Filterd-Recvd-Size: 5459 Received: from XPS-9350.home (unknown [47.151.153.53]) (Authenticated sender: joe@perches.com) by omf05.hostedemail.com (Postfix) with ESMTPA; Mon, 27 Aug 2018 15:52:29 +0000 (UTC) Message-ID: <4b9c74f372e6b72031e960d32b7d289c74cc6a09.camel@perches.com> Subject: Re: [PATCH v1] driver core: convert printk(KERN_ ...) to pr_ From: Joe Perches To: Andy Shevchenko , Greg Kroah-Hartman , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Date: Mon, 27 Aug 2018 08:52:27 -0700 In-Reply-To: <20180827152715.57456-1-andriy.shevchenko@linux.intel.com> References: <20180827152715.57456-1-andriy.shevchenko@linux.intel.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.28.1-2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2018-08-27 at 18:27 +0300, Andy Shevchenko wrote: > Convert printk:s to pr_* format. > > Note, printk(KERN_DEBUG ...) is left untouched due to side effects > of pr_debug(). > > Signed-off-by: Andy Shevchenko > --- > drivers/base/dd.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/base/dd.c b/drivers/base/dd.c > index edfc9f0b1180..f0434695961f 100644 > --- a/drivers/base/dd.c > +++ b/drivers/base/dd.c > @@ -321,8 +321,8 @@ bool device_is_bound(struct device *dev) > static void driver_bound(struct device *dev) > { > if (device_is_bound(dev)) { > - printk(KERN_WARNING "%s: device %s already bound\n", > - __func__, kobject_name(&dev->kobj)); > + pr_warn("%s: device %s already bound\n", __func__, > + kobject_name(&dev->kobj)); _ While I believe adding __func__ to printks is not generally useful, perhaps it's better to use pr_fmt like: #define pr_fmt(fmt) "%s: " fmt, __func__ to make it easier to remove the __func__ uses too. Maybe --- drivers/base/dd.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index edfc9f0b1180..5ad3a7f77013 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -16,6 +16,8 @@ * Copyright (c) 2007-2009 Novell Inc. */ +#define pr_fmt(fmt) "%s: " fmt, __func__ + #include #include #include @@ -321,13 +323,12 @@ bool device_is_bound(struct device *dev) static void driver_bound(struct device *dev) { if (device_is_bound(dev)) { - printk(KERN_WARNING "%s: device %s already bound\n", - __func__, kobject_name(&dev->kobj)); + pr_warn("device %s already bound\n", kobject_name(&dev->kobj)); return; } - pr_debug("driver: '%s': %s: bound to device '%s'\n", dev->driver->name, - __func__, dev_name(dev)); + pr_debug("driver: '%s': bound to device '%s'\n", + dev->driver->name, dev_name(dev)); klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices); device_links_driver_bound(dev); @@ -468,8 +469,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) return ret; atomic_inc(&probe_count); - pr_debug("bus: '%s': %s: probing driver %s with device %s\n", - drv->bus->name, __func__, drv->name, dev_name(dev)); + pr_debug("bus: '%s': probing driver %s with device %s\n", + drv->bus->name, drv->name, dev_name(dev)); WARN_ON(!list_empty(&dev->devres_head)); re_probe: @@ -485,8 +486,7 @@ static int really_probe(struct device *dev, struct device_driver *drv) goto dma_failed; if (driver_sysfs_add(dev)) { - printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n", - __func__, dev_name(dev)); + pr_err("driver_sysfs_add(%s) failed\n", dev_name(dev)); goto probe_failed; } @@ -532,8 +532,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) driver_bound(dev); ret = 1; - pr_debug("bus: '%s': %s: bound device %s to driver %s\n", - drv->bus->name, __func__, dev_name(dev), drv->name); + pr_debug("bus: '%s': bound device %s to driver %s\n", + drv->bus->name, dev_name(dev), drv->name); goto done; probe_failed: @@ -566,9 +566,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) break; default: /* driver matched but the probe failed */ - printk(KERN_WARNING - "%s: probe of %s failed with error %d\n", - drv->name, dev_name(dev), ret); + pr_warn("probe of %s failed with error %d\n", + drv->name, dev_name(dev), ret); } /* * Ignore errors returned by ->probe so that the next driver can try @@ -606,8 +605,7 @@ static int really_probe_debug(struct device *dev, struct device_driver *drv) */ int driver_probe_done(void) { - pr_debug("%s: probe_count = %d\n", __func__, - atomic_read(&probe_count)); + pr_debug("probe_count = %d\n", atomic_read(&probe_count)); if (atomic_read(&probe_count)) return -EBUSY; return 0; @@ -648,8 +646,8 @@ int driver_probe_device(struct device_driver *drv, struct device *dev) if (!device_is_registered(dev)) return -ENODEV; - pr_debug("bus: '%s': %s: matched device %s with driver %s\n", - drv->bus->name, __func__, dev_name(dev), drv->name); + pr_debug("bus: '%s': matched device %s with driver %s\n", + drv->bus->name, dev_name(dev), drv->name); pm_runtime_get_suppliers(dev); if (dev->parent)