| Message ID | ff48ce07ef208ba65b858f09279a3b36031d64d2.1588016644.git.gustavo@embeddedor.com |
|---|---|
| State | Accepted |
| Delegated to: | Miquel Raynal |
| Headers | show |
| Series | mtd: lpddr: Fix bad logic bug in print_drs_error | expand |
Hi Gustavo, "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote on Mon, 27 Apr 2020 14:54:13 -0500: > pr_notice is preferred over printk. > > Also, coalesce formats as coalescing is part of coding-style: > "never break user-visible strings such as printk messages" > > Suggested-by: Joe Perches <joe@perches.com> > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > --- > Changes in v2: > - Coalesce formats and update changelog text, accordingly. > > include/linux/mtd/pfow.h | 27 +++++++++++---------------- > 1 file changed, 11 insertions(+), 16 deletions(-) > > diff --git a/include/linux/mtd/pfow.h b/include/linux/mtd/pfow.h > index c65d7a3be3c6..cd21c6768065 100644 > --- a/include/linux/mtd/pfow.h > +++ b/include/linux/mtd/pfow.h > @@ -127,31 +127,26 @@ static inline void print_drs_error(unsigned dsr) > int prog_status = (dsr & DSR_RPS) >> 8; > > if (!(dsr & DSR_AVAILABLE)) > - printk(KERN_NOTICE"DSR.15: (0) Device not Available\n"); > + pr_notice("DSR.15: (0) Device not Available\n"); > if ((prog_status & 0x03) == 0x03) > - printk(KERN_NOTICE"DSR.9,8: (11) Attempt to program invalid " > - "half with 41h command\n"); > + pr_notice("DSR.9,8: (11) Attempt to program invalid half with 41h command\n"); > else if (prog_status & 0x02) > - printk(KERN_NOTICE"DSR.9,8: (10) Object Mode Program attempt " > - "in region with Control Mode data\n"); > + pr_notice("DSR.9,8: (10) Object Mode Program attempt in region with Control Mode data\n"); > else if (prog_status & 0x01) > - printk(KERN_NOTICE"DSR.9,8: (01) Program attempt in region " > - "with Object Mode data\n"); > + pr_notice("DSR.9,8: (01) Program attempt in region with Object Mode data\n"); > if (!(dsr & DSR_READY_STATUS)) > - printk(KERN_NOTICE"DSR.7: (0) Device is Busy\n"); > + pr_notice("DSR.7: (0) Device is Busy\n"); > if (dsr & DSR_ESS) > - printk(KERN_NOTICE"DSR.6: (1) Erase Suspended\n"); > + pr_notice("DSR.6: (1) Erase Suspended\n"); > if (dsr & DSR_ERASE_STATUS) > - printk(KERN_NOTICE"DSR.5: (1) Erase/Blank check error\n"); > + pr_notice("DSR.5: (1) Erase/Blank check error\n"); > if (dsr & DSR_PROGRAM_STATUS) > - printk(KERN_NOTICE"DSR.4: (1) Program Error\n"); > + pr_notice("DSR.4: (1) Program Error\n"); > if (dsr & DSR_VPPS) > - printk(KERN_NOTICE"DSR.3: (1) Vpp low detect, operation " > - "aborted\n"); > + pr_notice("DSR.3: (1) Vpp low detect, operation aborted\n"); > if (dsr & DSR_PSS) > - printk(KERN_NOTICE"DSR.2: (1) Program suspended\n"); > + pr_notice("DSR.2: (1) Program suspended\n"); > if (dsr & DSR_DPS) > - printk(KERN_NOTICE"DSR.1: (1) Aborted Erase/Program attempt " > - "on locked block\n"); > + pr_notice("DSR.1: (1) Aborted Erase/Program attempt on locked block\n"); > } > #endif /* __LINUX_MTD_PFOW_H */ Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Thanks, Miquèl
On Mon, 2020-04-27 at 19:54:13 UTC, "Gustavo A. R. Silva" wrote: > pr_notice is preferred over printk. > > Also, coalesce formats as coalescing is part of coding-style: > "never break user-visible strings such as printk messages" > > Suggested-by: Joe Perches <joe@perches.com> > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel
diff --git a/include/linux/mtd/pfow.h b/include/linux/mtd/pfow.h index c65d7a3be3c6..cd21c6768065 100644 --- a/include/linux/mtd/pfow.h +++ b/include/linux/mtd/pfow.h @@ -127,31 +127,26 @@ static inline void print_drs_error(unsigned dsr) int prog_status = (dsr & DSR_RPS) >> 8; if (!(dsr & DSR_AVAILABLE)) - printk(KERN_NOTICE"DSR.15: (0) Device not Available\n"); + pr_notice("DSR.15: (0) Device not Available\n"); if ((prog_status & 0x03) == 0x03) - printk(KERN_NOTICE"DSR.9,8: (11) Attempt to program invalid " - "half with 41h command\n"); + pr_notice("DSR.9,8: (11) Attempt to program invalid half with 41h command\n"); else if (prog_status & 0x02) - printk(KERN_NOTICE"DSR.9,8: (10) Object Mode Program attempt " - "in region with Control Mode data\n"); + pr_notice("DSR.9,8: (10) Object Mode Program attempt in region with Control Mode data\n"); else if (prog_status & 0x01) - printk(KERN_NOTICE"DSR.9,8: (01) Program attempt in region " - "with Object Mode data\n"); + pr_notice("DSR.9,8: (01) Program attempt in region with Object Mode data\n"); if (!(dsr & DSR_READY_STATUS)) - printk(KERN_NOTICE"DSR.7: (0) Device is Busy\n"); + pr_notice("DSR.7: (0) Device is Busy\n"); if (dsr & DSR_ESS) - printk(KERN_NOTICE"DSR.6: (1) Erase Suspended\n"); + pr_notice("DSR.6: (1) Erase Suspended\n"); if (dsr & DSR_ERASE_STATUS) - printk(KERN_NOTICE"DSR.5: (1) Erase/Blank check error\n"); + pr_notice("DSR.5: (1) Erase/Blank check error\n"); if (dsr & DSR_PROGRAM_STATUS) - printk(KERN_NOTICE"DSR.4: (1) Program Error\n"); + pr_notice("DSR.4: (1) Program Error\n"); if (dsr & DSR_VPPS) - printk(KERN_NOTICE"DSR.3: (1) Vpp low detect, operation " - "aborted\n"); + pr_notice("DSR.3: (1) Vpp low detect, operation aborted\n"); if (dsr & DSR_PSS) - printk(KERN_NOTICE"DSR.2: (1) Program suspended\n"); + pr_notice("DSR.2: (1) Program suspended\n"); if (dsr & DSR_DPS) - printk(KERN_NOTICE"DSR.1: (1) Aborted Erase/Program attempt " - "on locked block\n"); + pr_notice("DSR.1: (1) Aborted Erase/Program attempt on locked block\n"); } #endif /* __LINUX_MTD_PFOW_H */
pr_notice is preferred over printk. Also, coalesce formats as coalescing is part of coding-style: "never break user-visible strings such as printk messages" Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- Changes in v2: - Coalesce formats and update changelog text, accordingly. include/linux/mtd/pfow.h | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)