| Message ID | 1352853207-20602-2-git-send-email-rtivy@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
Hello. On 14-11-2012 4:33, Robert Tivy wrote: > Also, while modifying those pr_warning() calls I changed hardcoded > function names to use '"%s:", __func__' instead > Signed-off-by: Robert Tivy <rtivy@ti.com> > --- > Clean up files that will be otherwise modified in subsequent patch. > Applies to v3.7-rc2 tag (commit 6f0c0580b70c89094b3422ba81118c7b959c7556) of > Linus' mainline kernel at git.kernel.org. > arch/arm/mach-davinci/board-omapl138-hawk.c | 30 ++++++++++----------------- > 1 file changed, 11 insertions(+), 19 deletions(-) Taksing of separation of board and SoC specific changes, this patch shouldn't have been separated from patch 1 at all -- since it's two boards built around the same chip, OMAP-L138... > diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c > index dc1208e..8aea169 100644 > --- a/arch/arm/mach-davinci/board-omapl138-hawk.c > +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c > @@ -48,8 +48,7 @@ static __init void omapl138_hawk_config_emac(void) > val &= ~BIT(8); > ret = davinci_cfg_reg_list(omapl138_hawk_mii_pins); > if (ret) { > - pr_warning("%s: cpgmac/mii mux setup failed: %d\n", > - __func__, ret); > + pr_warn("%s: cpgmac/mii mux setup failed: %d\n", __func__, ret); I'd have preferred this as "CPGMAC/MII". Almost all other acronyms in the messages are capitalized. > return; > } > > @@ -61,8 +60,7 @@ static __init void omapl138_hawk_config_emac(void) > > ret = da8xx_register_emac(); > if (ret) > - pr_warning("%s: emac registration failed: %d\n", > - __func__, ret); > + pr_warn("%s: emac registration failed: %d\n", __func__, ret); ... and "EMAC" here. WBR, Sergei
Hi Sergei, Thanks for your feedback, please see below... > -----Original Message----- > From: Sergei Shtylyov [mailto:sshtylyov@mvista.com] > Sent: Wednesday, November 14, 2012 2:17 AM > To: Tivy, Robert > Cc: davinci-linux-open-source@linux.davincidsp.com; linux-arm- > kernel@lists.infradead.org; Ring, Chris; Grosen, Mark; Nori, Sekhar > Subject: Re: [PATCH v3 2/6] ARM: davinci: Changed pr_warning() to > pr_warn() (part 2) > > Hello. > > On 14-11-2012 4:33, Robert Tivy wrote: > > > Also, while modifying those pr_warning() calls I changed hardcoded > > function names to use '"%s:", __func__' instead > > > Signed-off-by: Robert Tivy <rtivy@ti.com> > > --- > > Clean up files that will be otherwise modified in subsequent patch. > > > Applies to v3.7-rc2 tag (commit > > 6f0c0580b70c89094b3422ba81118c7b959c7556) of Linus' mainline kernel > at git.kernel.org. > > > arch/arm/mach-davinci/board-omapl138-hawk.c | 30 ++++++++++------ > ----------- > > 1 file changed, 11 insertions(+), 19 deletions(-) > > Taksing of separation of board and SoC specific changes, this patch > shouldn't have been separated from patch 1 at all -- since it's two > boards built around the same chip, OMAP-L138... The 4 patches that are of the same nature ("Changed pr_warning() to pr_warn() (part #)") were split as 4 separate patches on request by Sekhar, for the purpose of making it easier to merge later. > > > diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c > > b/arch/arm/mach-davinci/board-omapl138-hawk.c > > index dc1208e..8aea169 100644 > > --- a/arch/arm/mach-davinci/board-omapl138-hawk.c > > +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c > > @@ -48,8 +48,7 @@ static __init void omapl138_hawk_config_emac(void) > > val &= ~BIT(8); > > ret = davinci_cfg_reg_list(omapl138_hawk_mii_pins); > > if (ret) { > > - pr_warning("%s: cpgmac/mii mux setup failed: %d\n", > > - __func__, ret); > > + pr_warn("%s: cpgmac/mii mux setup failed: %d\n", __func__, > ret); > > I'd have preferred this as "CPGMAC/MII". Almost all other acronyms > in the messages are capitalized. I didn't originate those acronyms so I'm not inclined to change them. Regards, - Rob > > > return; > > } > > > > @@ -61,8 +60,7 @@ static __init void omapl138_hawk_config_emac(void) > > > > ret = da8xx_register_emac(); > > if (ret) > > - pr_warning("%s: emac registration failed: %d\n", > > - __func__, ret); > > + pr_warn("%s: emac registration failed: %d\n", __func__, > ret); > > ... and "EMAC" here. > > WBR, Sergei
Hello. On 15-11-2012 5:53, Tivy, Robert wrote: >>> Also, while modifying those pr_warning() calls I changed hardcoded >>> function names to use '"%s:", __func__' instead >>> Signed-off-by: Robert Tivy <rtivy@ti.com> >>> --- >>> Clean up files that will be otherwise modified in subsequent patch. >>> Applies to v3.7-rc2 tag (commit >>> 6f0c0580b70c89094b3422ba81118c7b959c7556) of Linus' mainline kernel >> at git.kernel.org. >>> arch/arm/mach-davinci/board-omapl138-hawk.c | 30 ++++++++++------ >> ----------- >>> 1 file changed, 11 insertions(+), 19 deletions(-) >> Taksing of separation of board and SoC specific changes, this patch I meant "talking". :-/ >> shouldn't have been separated from patch 1 at all -- since it's two >> boards built around the same chip, OMAP-L138... > The 4 patches that are of the same nature ("Changed pr_warning() to pr_warn() (part #)") were split as 4 separate patches on request by Sekhar, for the purpose of making it easier to merge later. To quote Sekhar: "My main motivation was to keep board and soc file changes from mixing together." You just went too far. WBR, Sergei
On 11/15/2012 3:16 PM, Sergei Shtylyov wrote: > Hello. > > On 15-11-2012 5:53, Tivy, Robert wrote: > >>>> Also, while modifying those pr_warning() calls I changed hardcoded >>>> function names to use '"%s:", __func__' instead > >>>> Signed-off-by: Robert Tivy <rtivy@ti.com> >>>> --- >>>> Clean up files that will be otherwise modified in subsequent patch. > >>>> Applies to v3.7-rc2 tag (commit >>>> 6f0c0580b70c89094b3422ba81118c7b959c7556) of Linus' mainline kernel >>> at git.kernel.org. > >>>> arch/arm/mach-davinci/board-omapl138-hawk.c | 30 ++++++++++------ >>> ----------- >>>> 1 file changed, 11 insertions(+), 19 deletions(-) > >>> Taksing of separation of board and SoC specific changes, this patch > > I meant "talking". :-/ > >>> shouldn't have been separated from patch 1 at all -- since it's two >>> boards built around the same chip, OMAP-L138... > >> The 4 patches that are of the same nature ("Changed pr_warning() to >> pr_warn() (part #)") were split as 4 separate patches on request by >> Sekhar, for the purpose of making it easier to merge later. > > To quote Sekhar: "My main motivation was to keep board and soc file > changes from mixing together." You just went too far. Since this has already gone back and forth a couple of times (probably due to me not being entirely clear on what I want), lets proceed this way: Merge patches 1/6 and 2/6 into a patch titled: ARM: davinci: da850 board: change pr_warning() to pr_warn() Re-headline 3/6 as: ARM: davinci: devices-da8xx.c: change pr_warning() to pr_warn() Re-headline 4/6 as: ARM: davinci: psc.c: change pr_warning() to pr_warn() I hope that's acceptable to everyone involved. Thanks, Sekhar
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index dc1208e..8aea169 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -48,8 +48,7 @@ static __init void omapl138_hawk_config_emac(void) val &= ~BIT(8); ret = davinci_cfg_reg_list(omapl138_hawk_mii_pins); if (ret) { - pr_warning("%s: cpgmac/mii mux setup failed: %d\n", - __func__, ret); + pr_warn("%s: cpgmac/mii mux setup failed: %d\n", __func__, ret); return; } @@ -61,8 +60,7 @@ static __init void omapl138_hawk_config_emac(void) ret = da8xx_register_emac(); if (ret) - pr_warning("%s: emac registration failed: %d\n", - __func__, ret); + pr_warn("%s: emac registration failed: %d\n", __func__, ret); } /* @@ -147,15 +145,14 @@ static __init void omapl138_hawk_mmc_init(void) ret = davinci_cfg_reg_list(hawk_mmcsd0_pins); if (ret) { - pr_warning("%s: MMC/SD0 mux setup failed: %d\n", - __func__, ret); + pr_warn("%s: MMC/SD0 mux setup failed: %d\n", __func__, ret); return; } ret = gpio_request_one(DA850_HAWK_MMCSD_CD_PIN, GPIOF_DIR_IN, "MMC CD"); if (ret < 0) { - pr_warning("%s: can not open GPIO %d\n", + pr_warn("%s: can not open GPIO %d\n", __func__, DA850_HAWK_MMCSD_CD_PIN); return; } @@ -163,15 +160,14 @@ static __init void omapl138_hawk_mmc_init(void) ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN, GPIOF_DIR_IN, "MMC WP"); if (ret < 0) { - pr_warning("%s: can not open GPIO %d\n", + pr_warn("%s: can not open GPIO %d\n", __func__, DA850_HAWK_MMCSD_WP_PIN); goto mmc_setup_wp_fail; } ret = da8xx_register_mmcsd0(&da850_mmc_config); if (ret) { - pr_warning("%s: MMC/SD0 registration failed: %d\n", - __func__, ret); + pr_warn("%s: MMC/SD0 registration failed: %d\n", __func__, ret); goto mmc_setup_mmcsd_fail; } @@ -250,8 +246,7 @@ static __init void omapl138_hawk_usb_init(void) ret = davinci_cfg_reg_list(da850_hawk_usb11_pins); if (ret) { - pr_warning("%s: USB 1.1 PinMux setup failed: %d\n", - __func__, ret); + pr_warn("%s: USB 1.1 PinMux setup failed: %d\n", __func__, ret); return; } @@ -280,8 +275,7 @@ static __init void omapl138_hawk_usb_init(void) ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata); if (ret) { - pr_warning("%s: USB 1.1 registration failed: %d\n", - __func__, ret); + pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret); goto usb11_setup_fail; } @@ -307,8 +301,7 @@ static __init void omapl138_hawk_init(void) ret = da850_register_edma(da850_edma_rsv); if (ret) - pr_warning("%s: EDMA registration failed: %d\n", - __func__, ret); + pr_warn("%s: EDMA registration failed: %d\n", __func__, ret); omapl138_hawk_mmc_init(); @@ -316,9 +309,8 @@ static __init void omapl138_hawk_init(void) ret = da8xx_register_watchdog(); if (ret) - pr_warning("omapl138_hawk_init: " - "watchdog registration failed: %d\n", - ret); + pr_warn("%s: watchdog registration failed: %d\n", + __func__, ret); } #ifdef CONFIG_SERIAL_8250_CONSOLE
Also, while modifying those pr_warning() calls I changed hardcoded function names to use '"%s:", __func__' instead Signed-off-by: Robert Tivy <rtivy@ti.com> --- Clean up files that will be otherwise modified in subsequent patch. Applies to v3.7-rc2 tag (commit 6f0c0580b70c89094b3422ba81118c7b959c7556) of Linus' mainline kernel at git.kernel.org. arch/arm/mach-davinci/board-omapl138-hawk.c | 30 ++++++++++----------------- 1 file changed, 11 insertions(+), 19 deletions(-)