* [PATCH 24/35] drivers/mtd: Convert remaining uses of pr_warning to pr_warn
2017-02-17 7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
@ 2017-02-17 7:11 ` Joe Perches
2017-04-19 20:11 ` Brian Norris
2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
2017-02-23 15:28 ` Rob Herring
2 siblings, 1 reply; 9+ messages in thread
From: Joe Perches @ 2017-02-17 7:11 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, David Woodhouse,
Brian Norris, Marek Vasut, Cyrille Pitchen
Cc: linux-mtd, linux-kernel
To enable eventual removal of pr_warning
This makes pr_warn use consistent for drivers/mtd
Prior to this patch, there were 7 uses of pr_warning and
31 uses of pr_warn in drivers/mtd
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 12 ++++++++----
drivers/mtd/nand/cmx270_nand.c | 4 ++--
drivers/mtd/ofpart.c | 4 ++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 9dca881bb378..56aa6b75213d 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -323,7 +323,8 @@ static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd)
* it should report a size of 8KBytes (0x0020*256).
*/
cfi->cfiq->EraseRegionInfo[0] = 0x002003ff;
- pr_warning("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n", mtd->name);
+ pr_warn("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n",
+ mtd->name);
}
static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
@@ -333,7 +334,8 @@ static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
if ((cfi->cfiq->EraseRegionInfo[0] & 0xffff) == 0x003f) {
cfi->cfiq->EraseRegionInfo[0] |= 0x0040;
- pr_warning("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n", mtd->name);
+ pr_warn("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n",
+ mtd->name);
}
}
@@ -344,7 +346,8 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd)
if ((cfi->cfiq->EraseRegionInfo[1] & 0xffff) == 0x007e) {
cfi->cfiq->EraseRegionInfo[1] &= ~0x0040;
- pr_warning("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n", mtd->name);
+ pr_warn("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n",
+ mtd->name);
}
}
@@ -358,7 +361,8 @@ static void fixup_s29ns512p_sectors(struct mtd_info *mtd)
* which is not permitted by CFI.
*/
cfi->cfiq->EraseRegionInfo[0] = 0x020001ff;
- pr_warning("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n", mtd->name);
+ pr_warn("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n",
+ mtd->name);
}
/* Used to fix CFI-Tables of chips without Extended Query Tables */
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 226ac0bcafc6..949b9400dcb7 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -145,7 +145,7 @@ static int __init cmx270_init(void)
ret = gpio_request(GPIO_NAND_CS, "NAND CS");
if (ret) {
- pr_warning("CM-X270: failed to request NAND CS gpio\n");
+ pr_warn("CM-X270: failed to request NAND CS gpio\n");
return ret;
}
@@ -153,7 +153,7 @@ static int __init cmx270_init(void)
ret = gpio_request(GPIO_NAND_RB, "NAND R/B");
if (ret) {
- pr_warning("CM-X270: failed to request NAND R/B gpio\n");
+ pr_warn("CM-X270: failed to request NAND R/B gpio\n");
goto err_gpio_request;
}
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index 464470122493..2861c7079d7b 100644
--- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/ofpart.c
@@ -166,8 +166,8 @@ static int parse_ofoldpart_partitions(struct mtd_info *master,
if (!part)
return 0; /* No partitions found */
- pr_warning("Device tree uses obsolete partition map binding: %s\n",
- dp->full_name);
+ pr_warn("Device tree uses obsolete partition map binding: %s\n",
+ dp->full_name);
nr_parts = plen / sizeof(part[0]);
--
2.10.0.rc2.1.g053435c
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 24/35] drivers/mtd: Convert remaining uses of pr_warning to pr_warn
2017-02-17 7:11 ` [PATCH 24/35] drivers/mtd: Convert remaining uses of " Joe Perches
@ 2017-04-19 20:11 ` Brian Norris
0 siblings, 0 replies; 9+ messages in thread
From: Brian Norris @ 2017-04-19 20:11 UTC (permalink / raw)
To: Joe Perches
Cc: Boris Brezillon, Richard Weinberger, David Woodhouse, Marek Vasut,
Cyrille Pitchen, linux-mtd, linux-kernel
On Thu, Feb 16, 2017 at 11:11:37PM -0800, Joe Perches wrote:
> To enable eventual removal of pr_warning
>
> This makes pr_warn use consistent for drivers/mtd
>
> Prior to this patch, there were 7 uses of pr_warning and
> 31 uses of pr_warn in drivers/mtd
>
> Signed-off-by: Joe Perches <joe@perches.com>
Applied to l2-mtd.git
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-17 7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
2017-02-17 7:11 ` [PATCH 24/35] drivers/mtd: 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; 9+ messages in thread
From: Rafael J. Wysocki @ 2017-02-17 12:27 UTC (permalink / raw)
To: Joe Perches
Cc: Alexander Shishkin, Karol Herbst, Pekka Paalanen,
Richard Weinberger, Fabio Estevam, Linux Kernel Mailing List,
linux-arm-kernel@lists.infradead.org, linuxppc-dev, tboot-devel,
nouveau, oprofile-list, sfi-devel, xen-devel,
ACPI Devel Maling List, drbd-dev, virtualization, linux-crypto,
linux-ide, gigaset307x-common, linux-media,
Linux OMAP Mailing List, linux-mtd, devicetree@vger.kernel.org,
acpi4asus-user, platform-driver-x86, open list:TARGET SUBSYSTEM,
open list:FRAMEBUFFER LAYER,
moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM...,
linux-alpha, adi-buildroot-devel, linux-ia64@vger.kernel.org,
Linux-sh list, sparclinux, amd-gfx, dri-devel, linux-input,
netdev
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] 9+ messages in thread
* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
@ 2017-02-17 12:37 ` Geert Uytterhoeven
0 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2017-02-17 12:37 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Joe Perches, Alexander Shishkin, Karol Herbst, Pekka Paalanen,
Richard Weinberger, Fabio Estevam, Linux Kernel Mailing List,
linux-arm-kernel@lists.infradead.org, linuxppc-dev, tboot-devel,
nouveau, oprofile-list, sfi-devel, xen-devel,
ACPI Devel Maling List, Lars Ellenberg, virtualization,
Linux Crypto Mailing List, linux-ide@vger.kernel.org,
gigaset307x-common, Linux Media Mailing List,
Linux OMAP Mailing List, MTD Maling List,
devicetree@vger.kernel.org, acpi4asus-user, platform-driver-x86,
open list:TARGET SUBSYSTEM, open list:FRAMEBUFFER LAYER,
moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM...,
alpha, adi-buildroot-devel@lists.sourceforge.net,
linux-ia64@vger.kernel.org, Linux-sh list, sparclinux, amd-gfx,
dri-devel, linux-input@vger.kernel.org, netdev@vger.kernel.org
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] 9+ messages in thread
* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
2017-02-17 7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
2017-02-17 7:11 ` [PATCH 24/35] drivers/mtd: Convert remaining uses of " Joe Perches
2017-02-17 12:27 ` [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; 9+ messages in thread
From: Rob Herring @ 2017-02-23 15:28 UTC (permalink / raw)
To: Joe Perches
Cc: Alexander Shishkin, Karol Herbst, Pekka Paalanen,
Richard Weinberger, Fabio Estevam, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linuxppc-dev, tboot-devel,
nouveau, oprofile-list, sfi-devel, xen-devel,
linux-acpi@vger.kernel.org, drbd-dev, virtualization,
linux-crypto, linux-ide@vger.kernel.org, gigaset307x-common,
linux-media@vger.kernel.org, linux-omap,
linux-mtd@lists.infradead.org, devicetree@vger.kernel.org,
acpi4asus-user, platform-driver-x86, linux-scsi,
linux-fbdev@vger.kernel.org, Linux-ALSA, linux-alpha,
adi-buildroot-devel, linux-ia64, SH-Linux, sparclinux, amd-gfx,
dri-devel, linux-input@vger.kernel.org, netdev
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] 9+ messages in thread
* Re: [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; 9+ messages in thread
From: Joe Perches @ 2017-02-23 17:18 UTC (permalink / raw)
To: Rob Herring
Cc: Alexander Shishkin, Karol Herbst, Pekka Paalanen,
Richard Weinberger, Fabio Estevam, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linuxppc-dev, tboot-devel,
nouveau, oprofile-list, sfi-devel, xen-devel,
linux-acpi@vger.kernel.org, drbd-dev, virtualization,
linux-crypto, linux-ide@vger.kernel.org, gigaset307x-common,
linux-media@vger.kernel.org, linux-omap,
linux-mtd@lists.infradead.org, devicetree@vger.kernel.org,
acpi4asus-user, platform-driver-x86, linux-scsi,
linux-fbdev@vger.kernel.org, Linux-ALSA, linux-alpha,
adi-buildroot-devel, linux-ia64, SH-Linux, sparclinux, amd-gfx,
dri-devel, linux-input@vger.kernel.org, netdev
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] 9+ messages in thread
* Re: [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; 9+ messages in thread
From: Emil Velikov @ 2017-02-23 17:41 UTC (permalink / raw)
To: Joe Perches
Cc: Rob Herring, 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, linux-scsi,
Richard Weinberger, sfi-devel, amd-gfx mailing list,
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 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] 9+ messages in thread
* Re: [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; 9+ messages in thread
From: Joe Perches @ 2017-02-23 17:53 UTC (permalink / raw)
To: Emil Velikov
Cc: Rob Herring, 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, linux-scsi,
Richard Weinberger, sfi-devel, amd-gfx mailing list,
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 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] 9+ messages in thread