* [Drbd-dev] [PATCH 11/35] block/drbd: Convert remaining uses of pr_warning to pr_warn
2017-02-17 7:11 [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
@ 2017-02-17 7:11 ` Joe Perches
2017-02-17 12:27 ` [Drbd-dev] [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
2017-02-23 15:28 ` Rob Herring
2 siblings, 0 replies; 8+ messages in thread
From: Joe Perches @ 2017-02-17 7:11 UTC (permalink / raw)
To: Philipp Reisner, Lars Ellenberg; +Cc: linux-kernel, drbd-dev
To enable eventual removal of pr_warning
This makes pr_warn use consistent for drivers/block
Prior to this patch, there were 2 uses of pr_warning and
26 uses of pr_warn in drivers/block
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/block/drbd/drbd_nl.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 908c704e20aa..4a237b4418bb 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -251,19 +251,18 @@ static int drbd_adm_prepare(struct drbd_config_context *adm_ctx,
/* some more paranoia, if the request was over-determined */
if (adm_ctx->device && adm_ctx->resource &&
adm_ctx->device->resource != adm_ctx->resource) {
- pr_warning("request: minor=%u, resource=%s; but that minor belongs to resource %s\n",
- adm_ctx->minor, adm_ctx->resource->name,
- adm_ctx->device->resource->name);
+ pr_warn("request: minor=%u, resource=%s; but that minor belongs to resource %s\n",
+ adm_ctx->minor, adm_ctx->resource->name,
+ adm_ctx->device->resource->name);
drbd_msg_put_info(adm_ctx->reply_skb, "minor exists in different resource");
return ERR_INVALID_REQUEST;
}
if (adm_ctx->device &&
adm_ctx->volume != VOLUME_UNSPECIFIED &&
adm_ctx->volume != adm_ctx->device->vnr) {
- pr_warning("request: minor=%u, volume=%u; but that minor is volume %u in %s\n",
- adm_ctx->minor, adm_ctx->volume,
- adm_ctx->device->vnr,
- adm_ctx->device->resource->name);
+ pr_warn("request: minor=%u, volume=%u; but that minor is volume %u in %s\n",
+ adm_ctx->minor, adm_ctx->volume,
+ adm_ctx->device->vnr, adm_ctx->device->resource->name);
drbd_msg_put_info(adm_ctx->reply_skb, "minor exists as different volume");
return ERR_INVALID_REQUEST;
}
--
2.10.0.rc2.1.g053435c
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-17 7:11 [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
2017-02-17 7:11 ` [Drbd-dev] [PATCH 11/35] block/drbd: Convert remaining uses of " Joe Perches
@ 2017-02-17 12:27 ` Rafael J. Wysocki
2017-02-17 12:37 ` Geert Uytterhoeven
2017-02-23 15:28 ` Rob Herring
2 siblings, 1 reply; 8+ messages in thread
From: Rafael J. Wysocki @ 2017-02-17 12:27 UTC (permalink / raw)
To: Joe Perches
Cc: open list:FRAMEBUFFER LAYER, linux-ia64@vger.kernel.org,
Linux-sh list, Alexander Shishkin, nouveau,
moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM...,
dri-devel, virtualization, linux-ide, linux-mtd, sparclinux,
drbd-dev, open list:TARGET SUBSYSTEM, Richard Weinberger,
sfi-devel, amd-gfx, ACPI Devel Maling List, tboot-devel,
oprofile-list, linux-input, xen-devel, linux-media,
platform-driver-x86, devicetree@vger.kernel.org,
gigaset307x-common, acpi4asus-user, adi-buildroot-devel,
Pekka Paalanen, Linux OMAP Mailing List,
linux-arm-kernel@lists.infradead.org, netdev, Karol Herbst,
Linux Kernel Mailing List, linux-crypto, linux-alpha,
Fabio Estevam, linuxppc-dev
On Fri, Feb 17, 2017 at 8:11 AM, Joe Perches <joe@perches.com> wrote:
> There are ~4300 uses of pr_warn and ~250 uses of the older
> pr_warning in the kernel source tree.
>
> Make the use of pr_warn consistent across all kernel files.
>
> This excludes all files in tools/ as there is a separate
> define pr_warning for that directory tree and pr_warn is
> not used in tools/.
>
> Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
Sorry about asking if that has been asked already.
Wouldn't it be slightly less intrusive to simply redefined
pr_warning() as a synonym for pr_warn()?
Thanks,
Rafael
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-17 12:27 ` [Drbd-dev] [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
@ 2017-02-17 12:37 ` Geert Uytterhoeven
0 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2017-02-17 12:37 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: open list:FRAMEBUFFER LAYER, linux-ia64@vger.kernel.org,
Linux-sh list, Alexander Shishkin, nouveau,
moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM...,
dri-devel, virtualization, linux-ide@vger.kernel.org,
MTD Maling List, sparclinux, Lars Ellenberg,
open list:TARGET SUBSYSTEM, Richard Weinberger, sfi-devel,
amd-gfx, ACPI Devel Maling List, tboot-devel, oprofile-list,
linux-input@vger.kernel.org, xen-devel, Linux Media Mailing List,
platform-driver-x86, devicetree@vger.kernel.org,
gigaset307x-common, acpi4asus-user,
adi-buildroot-devel@lists.sourceforge.net, Joe Perches,
Pekka Paalanen, Linux OMAP Mailing List,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
Karol Herbst, Linux Kernel Mailing List,
Linux Crypto Mailing List, alpha, Fabio Estevam, linuxppc-dev
Hi Rafael,
On Fri, Feb 17, 2017 at 1:27 PM, Rafael J. Wysocki <rafael@kernel.org> wrote:
> On Fri, Feb 17, 2017 at 8:11 AM, Joe Perches <joe@perches.com> wrote:
>> There are ~4300 uses of pr_warn and ~250 uses of the older
>> pr_warning in the kernel source tree.
>>
>> Make the use of pr_warn consistent across all kernel files.
>>
>> This excludes all files in tools/ as there is a separate
>> define pr_warning for that directory tree and pr_warn is
>> not used in tools/.
>>
>> Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
>
> Sorry about asking if that has been asked already.
>
> Wouldn't it be slightly less intrusive to simply redefined
> pr_warning() as a synonym for pr_warn()?
That's already the case.
This series cleans up the cruft, so we can catch all users with
"git grep -w pr_warn".
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-17 7:11 [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
2017-02-17 7:11 ` [Drbd-dev] [PATCH 11/35] block/drbd: Convert remaining uses of " Joe Perches
2017-02-17 12:27 ` [Drbd-dev] [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
@ 2017-02-23 15:28 ` Rob Herring
2017-02-23 17:18 ` Joe Perches
2 siblings, 1 reply; 8+ messages in thread
From: Rob Herring @ 2017-02-23 15:28 UTC (permalink / raw)
To: Joe Perches
Cc: linux-fbdev@vger.kernel.org, linux-ia64, SH-Linux,
Alexander Shishkin, nouveau, Linux-ALSA, dri-devel,
virtualization, linux-ide@vger.kernel.org,
linux-mtd@lists.infradead.org, sparclinux, drbd-dev, linux-scsi,
Richard Weinberger, sfi-devel, amd-gfx,
linux-acpi@vger.kernel.org, tboot-devel, oprofile-list,
linux-input@vger.kernel.org, xen-devel,
linux-media@vger.kernel.org, platform-driver-x86,
devicetree@vger.kernel.org, gigaset307x-common, acpi4asus-user,
adi-buildroot-devel, Pekka Paalanen, linux-omap,
linux-arm-kernel@lists.infradead.org, netdev, Karol Herbst,
linux-kernel@vger.kernel.org, linux-crypto, linux-alpha,
Fabio Estevam, linuxppc-dev
On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
> There are ~4300 uses of pr_warn and ~250 uses of the older
> pr_warning in the kernel source tree.
>
> Make the use of pr_warn consistent across all kernel files.
>
> This excludes all files in tools/ as there is a separate
> define pr_warning for that directory tree and pr_warn is
> not used in tools/.
>
> Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
>
> Miscellanea:
>
> o Coalesce formats and realign arguments
>
> Some files not compiled - no cross-compilers
>
> Joe Perches (35):
> alpha: Convert remaining uses of pr_warning to pr_warn
> ARM: ep93xx: Convert remaining uses of pr_warning to pr_warn
> arm64: Convert remaining uses of pr_warning to pr_warn
> arch/blackfin: Convert remaining uses of pr_warning to pr_warn
> ia64: Convert remaining use of pr_warning to pr_warn
> powerpc: Convert remaining uses of pr_warning to pr_warn
> sh: Convert remaining uses of pr_warning to pr_warn
> sparc: Convert remaining use of pr_warning to pr_warn
> x86: Convert remaining uses of pr_warning to pr_warn
> drivers/acpi: Convert remaining uses of pr_warning to pr_warn
> block/drbd: Convert remaining uses of pr_warning to pr_warn
> gdrom: Convert remaining uses of pr_warning to pr_warn
> drivers/char: Convert remaining use of pr_warning to pr_warn
> clocksource: Convert remaining use of pr_warning to pr_warn
> drivers/crypto: Convert remaining uses of pr_warning to pr_warn
> fmc: Convert remaining use of pr_warning to pr_warn
> drivers/gpu: Convert remaining uses of pr_warning to pr_warn
> drivers/ide: Convert remaining uses of pr_warning to pr_warn
> drivers/input: Convert remaining uses of pr_warning to pr_warn
> drivers/isdn: Convert remaining uses of pr_warning to pr_warn
> drivers/macintosh: Convert remaining uses of pr_warning to pr_warn
> drivers/media: Convert remaining use of pr_warning to pr_warn
> drivers/mfd: Convert remaining uses of pr_warning to pr_warn
> drivers/mtd: Convert remaining uses of pr_warning to pr_warn
> drivers/of: Convert remaining uses of pr_warning to pr_warn
> drivers/oprofile: Convert remaining uses of pr_warning to pr_warn
> drivers/platform: Convert remaining uses of pr_warning to pr_warn
> drivers/rapidio: Convert remaining use of pr_warning to pr_warn
> drivers/scsi: Convert remaining use of pr_warning to pr_warn
> drivers/sh: Convert remaining use of pr_warning to pr_warn
> drivers/tty: Convert remaining uses of pr_warning to pr_warn
> drivers/video: Convert remaining uses of pr_warning to pr_warn
> kernel/trace: Convert remaining uses of pr_warning to pr_warn
> lib: Convert remaining uses of pr_warning to pr_warn
> sound/soc: Convert remaining uses of pr_warning to pr_warn
Where's the removal of pr_warning so we don't have more sneak in?
Rob
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-23 15:28 ` Rob Herring
@ 2017-02-23 17:18 ` Joe Perches
2017-02-23 17:41 ` Emil Velikov
0 siblings, 1 reply; 8+ messages in thread
From: Joe Perches @ 2017-02-23 17:18 UTC (permalink / raw)
To: Rob Herring
Cc: linux-fbdev@vger.kernel.org, linux-ia64, Richard, SH-Linux,
Alexander Shishkin, nouveau, Linux-ALSA, dri-devel,
virtualization, linux-ide@vger.kernel.org,
linux-mtd@lists.infradead.org, sparclinux, drbd-dev, linux-scsi,
Weinberger, sfi-devel, amd-gfx, linux-acpi@vger.kernel.org,
tboot-devel, oprofile-list, linux-input@vger.kernel.org,
xen-devel, linux-media@vger.kernel.org, platform-driver-x86,
devicetree@vger.kernel.org, gigaset307x-common, acpi4asus-user,
adi-buildroot-devel, Pekka Paalanen, linux-omap,
linux-arm-kernel@lists.infradead.org, netdev, Karol Herbst,
linux-kernel@vger.kernel.org, linux-crypto, linux-alpha,
Fabio Estevam, linuxppc-dev
On Thu, 2017-02-23 at 09:28 -0600, Rob Herring wrote:
> On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
> > There are ~4300 uses of pr_warn and ~250 uses of the older
> > pr_warning in the kernel source tree.
> >
> > Make the use of pr_warn consistent across all kernel files.
> >
> > This excludes all files in tools/ as there is a separate
> > define pr_warning for that directory tree and pr_warn is
> > not used in tools/.
> >
> > Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
[]
> Where's the removal of pr_warning so we don't have more sneak in?
After all of these actually get applied,
and maybe a cycle or two later, one would
get sent.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-23 17:18 ` Joe Perches
@ 2017-02-23 17:41 ` Emil Velikov
2017-02-23 17:53 ` Joe Perches
0 siblings, 1 reply; 8+ messages in thread
From: Emil Velikov @ 2017-02-23 17:41 UTC (permalink / raw)
To: Joe Perches
Cc: linux-fbdev@vger.kernel.org, linux-ia64, SH-Linux,
Alexander Shishkin, ML nouveau, Linux-ALSA, dri-devel,
open list:VIRTIO GPU DRIVER, linux-ide@vger.kernel.org,
linux-mtd@lists.infradead.org, sparclinux, drbd-dev, Rob Herring,
linux-omap, linux-scsi, Richard Weinberger, tboot-devel,
amd-gfx mailing list, linux-acpi@vger.kernel.org, sfi-devel,
oprofile-list, linux-input@vger.kernel.org, xen-devel,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
gigaset307x-common, acpi4asus-user, adi-buildroot-devel,
Pekka Paalanen, platform-driver-x86,
linux-arm-kernel@lists.infradead.org, netdev, Karol Herbst,
linux-kernel@vger.kernel.org, linux-crypto, linux-alpha,
Fabio Estevam, linuxppc-dev
On 23 February 2017 at 17:18, Joe Perches <joe@perches.com> wrote:
> On Thu, 2017-02-23 at 09:28 -0600, Rob Herring wrote:
>> On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
>> > There are ~4300 uses of pr_warn and ~250 uses of the older
>> > pr_warning in the kernel source tree.
>> >
>> > Make the use of pr_warn consistent across all kernel files.
>> >
>> > This excludes all files in tools/ as there is a separate
>> > define pr_warning for that directory tree and pr_warn is
>> > not used in tools/.
>> >
>> > Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
> []
>> Where's the removal of pr_warning so we don't have more sneak in?
>
> After all of these actually get applied,
> and maybe a cycle or two later, one would
> get sent.
>
By which point you'll get a few reincarnation of it. So you'll have to
do the same exercise again :-(
I guess the question is - are you expecting to get the series merged
all together/via one tree ? If not, your plan is perfectly reasonable.
Fwiw in the DRM subsystem, similar cleanups does purge the respective
macros/other with the final commit. But there one can pull the lot in
one go.
Regards,
Emil
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Drbd-dev] [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-23 17:41 ` Emil Velikov
@ 2017-02-23 17:53 ` Joe Perches
0 siblings, 0 replies; 8+ messages in thread
From: Joe Perches @ 2017-02-23 17:53 UTC (permalink / raw)
To: Emil Velikov
Cc: linux-fbdev@vger.kernel.org, linux-ia64, SH-Linux,
Alexander Shishkin, ML nouveau, Linux-ALSA, dri-devel,
open list:VIRTIO GPU DRIVER, linux-ide@vger.kernel.org,
linux-mtd@lists.infradead.org, sparclinux, drbd-dev, Rob Herring,
linux-omap, linux-scsi, Richard Weinberger, tboot-devel,
amd-gfx mailing list, linux-acpi@vger.kernel.org, sfi-devel,
oprofile-list, linux-input@vger.kernel.org, xen-devel,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
gigaset307x-common, acpi4asus-user, adi-buildroot-devel,
Pekka Paalanen, platform-driver-x86,
linux-arm-kernel@lists.infradead.org, netdev, Karol Herbst,
linux-kernel@vger.kernel.org, linux-crypto, linux-alpha,
Fabio Estevam, linuxppc-dev
On Thu, 2017-02-23 at 17:41 +0000, Emil Velikov wrote:
> On 23 February 2017 at 17:18, Joe Perches <joe@perches.com> wrote:
> > On Thu, 2017-02-23 at 09:28 -0600, Rob Herring wrote:
> > > On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
> > > > There are ~4300 uses of pr_warn and ~250 uses of the older
> > > > pr_warning in the kernel source tree.
> > > >
> > > > Make the use of pr_warn consistent across all kernel files.
> > > >
> > > > This excludes all files in tools/ as there is a separate
> > > > define pr_warning for that directory tree and pr_warn is
> > > > not used in tools/.
> > > >
> > > > Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
> >
> > []
> > > Where's the removal of pr_warning so we don't have more sneak in?
> >
> > After all of these actually get applied,
> > and maybe a cycle or two later, one would
> > get sent.
> >
>
> By which point you'll get a few reincarnation of it. So you'll have to
> do the same exercise again :-(
Maybe to one or two files. Not a big deal.
> I guess the question is - are you expecting to get the series merged
> all together/via one tree ?
No. The only person that could do that effectively is Linus.
> If not, your plan is perfectly reasonable.
^ permalink raw reply [flat|nested] 8+ messages in thread