From: weiyufeng <weiyufeng@kylinos.cn>
change printk to standard kernel printing functions.
Signed-off-by: weiyufeng <weiyufeng@kylinos.cn>
---
drivers/net/hamradio/baycom_epp.c | 8 ++++----
drivers/net/hamradio/baycom_par.c | 6 +++---
drivers/parport/parport_pc.c | 12 ++++++------
drivers/parport/procfs.c | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 9e366f275406..1b7fd6d49a96 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -828,13 +828,13 @@ static int epp_open(struct net_device *dev)
}
#if 0
if (pp->irq < 0) {
- printk(KERN_ERR "%s: parport at 0x%lx has no irq\n", bc_drvname, pp->base);
+ pr_err("%s: parport at 0x%lx has no irq\n", bc_drvname, pp->base);
parport_put_port(pp);
return -ENXIO;
}
#endif
if ((~pp->modes) & (PARPORT_MODE_TRISTATE | PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT)) {
- printk(KERN_ERR "%s: parport at 0x%lx cannot be used\n",
+ pr_err("%s: parport at 0x%lx cannot be used\n",
bc_drvname, pp->base);
parport_put_port(pp);
return -EIO;
@@ -857,11 +857,11 @@ static int epp_open(struct net_device *dev)
bc->pdev = parport_register_dev_model(pp, dev->name, &par_cb, i);
parport_put_port(pp);
if (!bc->pdev) {
- printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
+ pr_err("%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
return -ENXIO;
}
if (parport_claim(bc->pdev)) {
- printk(KERN_ERR "%s: parport at 0x%lx busy\n", bc_drvname, pp->base);
+ pr_err("%s: parport at 0x%lx busy\n", bc_drvname, pp->base);
parport_unregister_device(bc->pdev);
return -EBUSY;
}
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index 00ebc25d0b22..4b57874c2463 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -307,12 +307,12 @@ static int par96_open(struct net_device *dev)
return -ENXIO;
}
if (pp->irq < 0) {
- printk(KERN_ERR "baycom_par: parport at 0x%lx has no irq\n", pp->base);
+ pr_err("baycom_par: parport at 0x%lx has no irq\n", pp->base);
parport_put_port(pp);
return -ENXIO;
}
if ((~pp->modes) & (PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT)) {
- printk(KERN_ERR "baycom_par: parport at 0x%lx cannot be used\n", pp->base);
+ pr_err("baycom_par: parport at 0x%lx cannot be used\n", pp->base);
parport_put_port(pp);
return -ENXIO;
}
@@ -339,7 +339,7 @@ static int par96_open(struct net_device *dev)
return -ENXIO;
}
if (parport_claim(bc->pdev)) {
- printk(KERN_ERR "baycom_par: parport at 0x%lx busy\n", pp->base);
+ pr_err("baycom_par: parport at 0x%lx busy\n", pp->base);
parport_unregister_device(bc->pdev);
return -EBUSY;
}
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index f33b5d1ddfc1..609c10d4bc31 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1609,7 +1609,7 @@ static int parport_ECP_supported(struct parport *pb)
priv->fifo_depth = i;
if (verbose_probing)
- printk(KERN_DEBUG "0x%lx: FIFO is %d bytes\n", pb->base, i);
+ pr_debug("0x%lx: FIFO is %d bytes\n", pb->base, i);
/* Find out writeIntrThreshold */
frob_econtrol(pb, 1<<2, 1<<2);
@@ -1623,7 +1623,7 @@ static int parport_ECP_supported(struct parport *pb)
if (i <= priv->fifo_depth) {
if (verbose_probing)
- printk(KERN_DEBUG "0x%lx: writeIntrThreshold is %d\n",
+ pr_debug("0x%lx: writeIntrThreshold is %d\n",
pb->base, i);
} else
/* Number of bytes we know we can write if we get an
@@ -1676,16 +1676,16 @@ static int parport_ECP_supported(struct parport *pb)
priv->pword = pword;
if (verbose_probing) {
- printk(KERN_DEBUG "0x%lx: PWord is %d bits\n",
+ pr_debug("0x%lx: PWord is %d bits\n",
pb->base, 8 * pword);
- printk(KERN_DEBUG "0x%lx: Interrupts are ISA-%s\n",
+ pr_debug("0x%lx: Interrupts are ISA-%s\n",
pb->base, config & 0x80 ? "Level" : "Pulses");
configb = inb(CONFIGB(pb));
- printk(KERN_DEBUG "0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
+ pr_debug("0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
pb->base, config, configb);
- printk(KERN_DEBUG "0x%lx: ECP settings irq=", pb->base);
+ pr_debug("0x%lx: ECP settings irq=", pb->base);
if ((configb >> 3) & 0x07)
pr_cont("%d", intrline[(configb >> 3) & 0x07]);
else
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index 3880460e67f2..3f809fff317b 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -128,7 +128,7 @@ static int do_hardware_base_addr(const struct ctl_table *table, int write,
if (write) /* permissions prevent this anyway */
return -EACCES;
- len += scnprintf (buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
+ len += scnprintf(buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
if (len > *lenp)
len = *lenp;
--
2.25.1On 11/12/24 11:11, 412574090@163.com wrote:
> From: weiyufeng <weiyufeng@kylinos.cn>
>
> change printk to standard kernel printing functions.
>
> Signed-off-by: weiyufeng <weiyufeng@kylinos.cn>
> ---
> drivers/net/hamradio/baycom_epp.c | 8 ++++----
> drivers/net/hamradio/baycom_par.c | 6 +++---
> drivers/parport/parport_pc.c | 12 ++++++------
> drivers/parport/procfs.c | 2 +-
This is mixing changes for different drivers. Please split the net and ata part
into different patches and send the net ones to the correct list and maintainers.
> 4 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
> index 9e366f275406..1b7fd6d49a96 100644
> --- a/drivers/net/hamradio/baycom_epp.c
> +++ b/drivers/net/hamradio/baycom_epp.c
> @@ -828,13 +828,13 @@ static int epp_open(struct net_device *dev)
> }
> #if 0
> if (pp->irq < 0) {
> - printk(KERN_ERR "%s: parport at 0x%lx has no irq\n", bc_drvname, pp->base);
> + pr_err("%s: parport at 0x%lx has no irq\n", bc_drvname, pp->base);
> parport_put_port(pp);
> return -ENXIO;
> }
> #endif
> if ((~pp->modes) & (PARPORT_MODE_TRISTATE | PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT)) {
> - printk(KERN_ERR "%s: parport at 0x%lx cannot be used\n",
> + pr_err("%s: parport at 0x%lx cannot be used\n",
> bc_drvname, pp->base);
> parport_put_port(pp);
> return -EIO;
> @@ -857,11 +857,11 @@ static int epp_open(struct net_device *dev)
> bc->pdev = parport_register_dev_model(pp, dev->name, &par_cb, i);
> parport_put_port(pp);
> if (!bc->pdev) {
> - printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
> + pr_err("%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
> return -ENXIO;
> }
> if (parport_claim(bc->pdev)) {
> - printk(KERN_ERR "%s: parport at 0x%lx busy\n", bc_drvname, pp->base);
> + pr_err("%s: parport at 0x%lx busy\n", bc_drvname, pp->base);
> parport_unregister_device(bc->pdev);
> return -EBUSY;
> }
> diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
> index 00ebc25d0b22..4b57874c2463 100644
> --- a/drivers/net/hamradio/baycom_par.c
> +++ b/drivers/net/hamradio/baycom_par.c
> @@ -307,12 +307,12 @@ static int par96_open(struct net_device *dev)
> return -ENXIO;
> }
> if (pp->irq < 0) {
> - printk(KERN_ERR "baycom_par: parport at 0x%lx has no irq\n", pp->base);
> + pr_err("baycom_par: parport at 0x%lx has no irq\n", pp->base);
> parport_put_port(pp);
> return -ENXIO;
> }
> if ((~pp->modes) & (PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT)) {
> - printk(KERN_ERR "baycom_par: parport at 0x%lx cannot be used\n", pp->base);
> + pr_err("baycom_par: parport at 0x%lx cannot be used\n", pp->base);
> parport_put_port(pp);
> return -ENXIO;
> }
> @@ -339,7 +339,7 @@ static int par96_open(struct net_device *dev)
> return -ENXIO;
> }
> if (parport_claim(bc->pdev)) {
> - printk(KERN_ERR "baycom_par: parport at 0x%lx busy\n", pp->base);
> + pr_err("baycom_par: parport at 0x%lx busy\n", pp->base);
> parport_unregister_device(bc->pdev);
> return -EBUSY;
> }
> diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
> index f33b5d1ddfc1..609c10d4bc31 100644
> --- a/drivers/parport/parport_pc.c
> +++ b/drivers/parport/parport_pc.c
> @@ -1609,7 +1609,7 @@ static int parport_ECP_supported(struct parport *pb)
>
> priv->fifo_depth = i;
> if (verbose_probing)
> - printk(KERN_DEBUG "0x%lx: FIFO is %d bytes\n", pb->base, i);
> + pr_debug("0x%lx: FIFO is %d bytes\n", pb->base, i);
>
> /* Find out writeIntrThreshold */
> frob_econtrol(pb, 1<<2, 1<<2);
> @@ -1623,7 +1623,7 @@ static int parport_ECP_supported(struct parport *pb)
>
> if (i <= priv->fifo_depth) {
> if (verbose_probing)
> - printk(KERN_DEBUG "0x%lx: writeIntrThreshold is %d\n",
> + pr_debug("0x%lx: writeIntrThreshold is %d\n",
> pb->base, i);
> } else
> /* Number of bytes we know we can write if we get an
> @@ -1676,16 +1676,16 @@ static int parport_ECP_supported(struct parport *pb)
> priv->pword = pword;
>
> if (verbose_probing) {
> - printk(KERN_DEBUG "0x%lx: PWord is %d bits\n",
> + pr_debug("0x%lx: PWord is %d bits\n",
> pb->base, 8 * pword);
>
> - printk(KERN_DEBUG "0x%lx: Interrupts are ISA-%s\n",
> + pr_debug("0x%lx: Interrupts are ISA-%s\n",
> pb->base, config & 0x80 ? "Level" : "Pulses");
>
> configb = inb(CONFIGB(pb));
> - printk(KERN_DEBUG "0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
> + pr_debug("0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
> pb->base, config, configb);
> - printk(KERN_DEBUG "0x%lx: ECP settings irq=", pb->base);
> + pr_debug("0x%lx: ECP settings irq=", pb->base);
> if ((configb >> 3) & 0x07)
> pr_cont("%d", intrline[(configb >> 3) & 0x07]);
> else
> diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
> index 3880460e67f2..3f809fff317b 100644
> --- a/drivers/parport/procfs.c
> +++ b/drivers/parport/procfs.c
> @@ -128,7 +128,7 @@ static int do_hardware_base_addr(const struct ctl_table *table, int write,
> if (write) /* permissions prevent this anyway */
> return -EACCES;
>
> - len += scnprintf (buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
> + len += scnprintf(buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
>
> if (len > *lenp)
> len = *lenp;
--
Damien Le Moal
Western Digital Research
> On 11/12/24 11:11, 412574090@163.com wrote:
> > From: weiyufeng <weiyufeng@kylinos.cn>
> >
> > change printk to standard kernel printing functions.
> >
> > Signed-off-by: weiyufeng <weiyufeng@kylinos.cn>
> > ---
> > drivers/net/hamradio/baycom_epp.c | 8 ++++----
> > drivers/net/hamradio/baycom_par.c | 6 +++---
> > drivers/parport/parport_pc.c | 12 ++++++------
> > drivers/parport/procfs.c | 2 +-
>
> This is mixing changes for different drivers. Please split the net and ata part
> into different patches and send the net ones to the correct list and maintainers.
Yes, it will be updated in v3 version. Can you help review the patch for
path2-patch4? If possible, it would be a great honor.
>
> > 4 files changed, 14 insertions(+), 14 deletions(-)
>
> > diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
> > index 9e366f275406..1b7fd6d49a96 100644
> > --- a/drivers/net/hamradio/baycom_epp.c
> > +++ b/drivers/net/hamradio/baycom_epp.c
> > @@ -828,13 +828,13 @@ static int epp_open(struct net_device *dev)
> > }
> > #if 0
> > if (pp->irq < 0) {
> > - printk(KERN_ERR "%s: parport at 0x%lx has no irq\n", bc_drvname, pp->base);
> > + pr_err("%s: parport at 0x%lx has no irq\n", bc_drvname, pp->base);
> > parport_put_port(pp);
> > return -ENXIO;
> > }
> > #endif
> > if ((~pp->modes) & (PARPORT_MODE_TRISTATE | PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT)) {
> > - printk(KERN_ERR "%s: parport at 0x%lx cannot be used\n",
> > + pr_err("%s: parport at 0x%lx cannot be used\n",
> > bc_drvname, pp->base);
> > parport_put_port(pp);
> > return -EIO;
> > @@ -857,11 +857,11 @@ static int epp_open(struct net_device *dev)
> > bc->pdev = parport_register_dev_model(pp, dev->name, &par_cb, i);
> > parport_put_port(pp);
> > if (!bc->pdev) {
> > - printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
> > + pr_err("%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
> > return -ENXIO;
> > }
> > if (parport_claim(bc->pdev)) {
> > - printk(KERN_ERR "%s: parport at 0x%lx busy\n", bc_drvname, pp->base);
> > + pr_err("%s: parport at 0x%lx busy\n", bc_drvname, pp->base);
> > parport_unregister_device(bc->pdev);
> > return -EBUSY;
> > }
> > diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
> > index 00ebc25d0b22..4b57874c2463 100644
> > --- a/drivers/net/hamradio/baycom_par.c
> > +++ b/drivers/net/hamradio/baycom_par.c
> > @@ -307,12 +307,12 @@ static int par96_open(struct net_device *dev)
> > return -ENXIO;
> > }
> > if (pp->irq < 0) {
> > - printk(KERN_ERR "baycom_par: parport at 0x%lx has no irq\n", pp->base);
> > + pr_err("baycom_par: parport at 0x%lx has no irq\n", pp->base);
> > parport_put_port(pp);
> > return -ENXIO;
> > }
> > if ((~pp->modes) & (PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT)) {
> > - printk(KERN_ERR "baycom_par: parport at 0x%lx cannot be used\n", pp->base);
> > + pr_err("baycom_par: parport at 0x%lx cannot be used\n", pp->base);
> > parport_put_port(pp);
> > return -ENXIO;
> > }
> > @@ -339,7 +339,7 @@ static int par96_open(struct net_device *dev)
> > return -ENXIO;
> > }
> > if (parport_claim(bc->pdev)) {
> > - printk(KERN_ERR "baycom_par: parport at 0x%lx busy\n", pp->base);
> > + pr_err("baycom_par: parport at 0x%lx busy\n", pp->base);
> > parport_unregister_device(bc->pdev);
> > return -EBUSY;
> > }
> > diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
> > index f33b5d1ddfc1..609c10d4bc31 100644
> > --- a/drivers/parport/parport_pc.c
> > +++ b/drivers/parport/parport_pc.c
> > @@ -1609,7 +1609,7 @@ static int parport_ECP_supported(struct parport *pb)
> >
> > priv->fifo_depth = i;
> > if (verbose_probing)
> > - printk(KERN_DEBUG "0x%lx: FIFO is %d bytes\n", pb->base, i);
> > + pr_debug("0x%lx: FIFO is %d bytes\n", pb->base, i);
> >
> > /* Find out writeIntrThreshold */
> > frob_econtrol(pb, 1<<2, 1<<2);
> > @@ -1623,7 +1623,7 @@ static int parport_ECP_supported(struct parport *pb)
> >
> > if (i <= priv->fifo_depth) {
> > if (verbose_probing)
> > - printk(KERN_DEBUG "0x%lx: writeIntrThreshold is %d\n",
> > + pr_debug("0x%lx: writeIntrThreshold is %d\n",
> > pb->base, i);
> > } else
> > /* Number of bytes we know we can write if we get an
> > @@ -1676,16 +1676,16 @@ static int parport_ECP_supported(struct parport *pb)
> > priv->pword = pword;
> >
> > if (verbose_probing) {
> > - printk(KERN_DEBUG "0x%lx: PWord is %d bits\n",
> > + pr_debug("0x%lx: PWord is %d bits\n",
> > pb->base, 8 * pword);
> >
> > - printk(KERN_DEBUG "0x%lx: Interrupts are ISA-%s\n",
> > + pr_debug("0x%lx: Interrupts are ISA-%s\n",
> > pb->base, config & 0x80 ? "Level" : "Pulses");
> >
> > configb = inb(CONFIGB(pb));
> > - printk(KERN_DEBUG "0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
> > + pr_debug("0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
> > pb->base, config, configb);
> > - printk(KERN_DEBUG "0x%lx: ECP settings irq=", pb->base);
> > + pr_debug("0x%lx: ECP settings irq=", pb->base);
> > if ((configb >> 3) & 0x07)
> > pr_cont("%d", intrline[(configb >> 3) & 0x07]);
> > else
> > diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
> > index 3880460e67f2..3f809fff317b 100644
> > --- a/drivers/parport/procfs.c
> > +++ b/drivers/parport/procfs.c
> > @@ -128,7 +128,7 @@ static int do_hardware_base_addr(const struct ctl_table *table, int write,
> > if (write) /* permissions prevent this anyway */
> > return -EACCES;
> >
> > - len += scnprintf (buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
> > + len += scnprintf(buffer, sizeof(buffer), "%lu\t%lu\n", port->base, port->base_hi);
> >
> > if (len > *lenp)
> > len = *lenp;
--
Thanks,
weiyufeng
Hello weiyufeng, On Mon, Nov 18, 2024 at 10:30:24AM +0800, 412574090@163.com wrote: > > On 11/12/24 11:11, 412574090@163.com wrote: > > > From: weiyufeng <weiyufeng@kylinos.cn> > > > > > > change printk to standard kernel printing functions. > > > > > > Signed-off-by: weiyufeng <weiyufeng@kylinos.cn> > > > --- > > > drivers/net/hamradio/baycom_epp.c | 8 ++++---- > > > drivers/net/hamradio/baycom_par.c | 6 +++--- > > > drivers/parport/parport_pc.c | 12 ++++++------ > > > drivers/parport/procfs.c | 2 +- > > > > This is mixing changes for different drivers. Please split the net and ata part > > into different patches and send the net ones to the correct list and maintainers. > Yes, it will be updated in v3 version. Can you help review the patch for > path2-patch4? If possible, it would be a great honor. Sorry, that is not how it works. If I look at patch 2/4, it changes all these files: drivers/ata/pata_parport/bpck6.c | 2 +- drivers/ata/pata_parport/pata_parport.c | 2 +- drivers/auxdisplay/ks0108.c | 4 +-- drivers/net/hamradio/baycom_epp.c | 10 +++--- drivers/net/hamradio/baycom_par.c | 6 ++-- drivers/net/plip/plip.c | 2 +- drivers/parport/daisy.c | 2 +- drivers/parport/parport_gsc.c | 8 ++--- drivers/parport/parport_ip32.c | 8 ++--- drivers/parport/parport_mfc3.c | 2 +- drivers/parport/parport_pc.c | 42 ++++++++++++------------- drivers/parport/parport_sunbpp.c | 24 +++++++------- drivers/parport/procfs.c | 2 +- drivers/parport/share.c | 6 ++-- drivers/scsi/imm.c | 8 ++--- drivers/scsi/ppa.c | 10 +++--- include/linux/parport.h | 4 +-- include/linux/parport_pc.h | 18 +++++------ sound/drivers/mts64.c | 6 ++-- sound/drivers/portman2x4.c | 6 ++-- So we cannot give your Reviewed-by tag to this commit. So please split the commit to the appropriate subsystems, and CC: the proper mailing lists for each commit. (Check the MAINTAINERS file.) Then people will be able to review your changes. Kind regards, Niklas
© 2016 - 2026 Red Hat, Inc.