On 2021/12/09 1:32, Hannes Reinecke wrote:
> Convert blank printk() calls to structured logging.
s/blank/raw ? Since they are not empty prints...
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
> ---
> drivers/ata/pata_atp867x.c | 29 ++++++++++++-----------------
> 1 file changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
> index 2bc5fc81efe3..84dac8c69085 100644
> --- a/drivers/ata/pata_atp867x.c
> +++ b/drivers/ata/pata_atp867x.c
> @@ -155,7 +155,7 @@ static int atp867x_get_active_clocks_shifted(struct ata_port *ap,
> case 1 ... 6:
> break;
> default:
> - printk(KERN_WARNING "ATP867X: active %dclk is invalid. "
> + ata_port_warn(ap, "ATP867X: active %dclk is invalid. "
> "Using 12clk.\n", clk);
> fallthrough;
> case 9 ... 12:
> @@ -171,7 +171,8 @@ static int atp867x_get_active_clocks_shifted(struct ata_port *ap,
> return clocks << ATP867X_IO_PIOSPD_ACTIVE_SHIFT;
> }
>
> -static int atp867x_get_recover_clocks_shifted(unsigned int clk)
> +static int atp867x_get_recover_clocks_shifted(struct ata_port *ap,
> + unsigned int clk)
> {
> unsigned char clocks = clk;
>
> @@ -188,7 +189,7 @@ static int atp867x_get_recover_clocks_shifted(unsigned int clk)
> case 15:
> break;
> default:
> - printk(KERN_WARNING "ATP867X: recover %dclk is invalid. "
> + ata_port_warn(ap, "ATP867X: recover %dclk is invalid. "
> "Using default 12clk.\n", clk);
> fallthrough;
> case 12: /* default 12 clk */
> @@ -225,7 +226,7 @@ static void atp867x_set_piomode(struct ata_port *ap, struct ata_device *adev)
> iowrite8(b, dp->dma_mode);
>
> b = atp867x_get_active_clocks_shifted(ap, t.active) |
> - atp867x_get_recover_clocks_shifted(t.recover);
> + atp867x_get_recover_clocks_shifted(ap, t.recover);
>
> if (adev->devno & 1)
> iowrite8(b, dp->slave_piospd);
> @@ -233,7 +234,7 @@ static void atp867x_set_piomode(struct ata_port *ap, struct ata_device *adev)
> iowrite8(b, dp->mstr_piospd);
>
> b = atp867x_get_active_clocks_shifted(ap, t.act8b) |
> - atp867x_get_recover_clocks_shifted(t.rec8b);
> + atp867x_get_recover_clocks_shifted(ap, t.rec8b);
>
> iowrite8(b, dp->eightb_piospd);
> }
> @@ -270,7 +271,6 @@ static struct ata_port_operations atp867x_ops = {
> };
>
>
> -#ifdef ATP867X_DEBUG
> static void atp867x_check_res(struct pci_dev *pdev)
> {
> int i;
> @@ -280,7 +280,7 @@ static void atp867x_check_res(struct pci_dev *pdev)
> for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
> start = pci_resource_start(pdev, i);
> len = pci_resource_len(pdev, i);
> - printk(KERN_DEBUG "ATP867X: resource start:len=%lx:%lx\n",
> + dev_dbg(&pdev->dev, "ATP867X: resource start:len=%lx:%lx\n",
> start, len);
> }
> }
> @@ -290,7 +290,7 @@ static void atp867x_check_ports(struct ata_port *ap, int port)
> struct ata_ioports *ioaddr = &ap->ioaddr;
> struct atp867x_priv *dp = ap->private_data;
>
> - printk(KERN_DEBUG "ATP867X: port[%d] addresses\n"
> + ata_port_dbg(ap, "ATP867X: port[%d] addresses\n"
> " cmd_addr =0x%llx, 0x%llx\n"
> " ctl_addr =0x%llx, 0x%llx\n"
> " bmdma_addr =0x%llx, 0x%llx\n"
> @@ -332,7 +332,6 @@ static void atp867x_check_ports(struct ata_port *ap, int port)
> (unsigned long long)dp->eightb_piospd,
> (unsigned long)dp->pci66mhz);
> }
> -#endif
>
> static int atp867x_set_priv(struct ata_port *ap)
> {
> @@ -370,8 +369,7 @@ static void atp867x_fixup(struct ata_host *host)
> if (v < 0x80) {
> v = 0x80;
> pci_write_config_byte(pdev, PCI_LATENCY_TIMER, v);
> - printk(KERN_DEBUG "ATP867X: set latency timer of device %s"
> - " to %d\n", pci_name(pdev), v);
> + dev_dbg(&pdev->dev, "ATP867X: set latency timer to %d\n", v);
> }
>
> /*
> @@ -419,13 +417,11 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host)
> return rc;
> host->iomap = pcim_iomap_table(pdev);
>
> -#ifdef ATP867X_DEBUG
> atp867x_check_res(pdev);
>
> for (i = 0; i < PCI_STD_NUM_BARS; i++)
> - printk(KERN_DEBUG "ATP867X: iomap[%d]=0x%llx\n", i,
> + dev_dbg(gdev, "ATP867X: iomap[%d]=0x%llx\n", i,
> (unsigned long long)(host->iomap[i]));
> -#endif
>
> /*
> * request, iomap BARs and init port addresses accordingly
> @@ -444,9 +440,8 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host)
> if (rc)
> return rc;
>
> -#ifdef ATP867X_DEBUG
> atp867x_check_ports(ap, i);
> -#endif
> +
> ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx",
> (unsigned long)ioaddr->cmd_addr,
> (unsigned long)ioaddr->ctl_addr);
> @@ -486,7 +481,7 @@ static int atp867x_init_one(struct pci_dev *pdev,
> if (rc)
> return rc;
>
> - printk(KERN_INFO "ATP867X: ATP867 ATA UDMA133 controller (rev %02X)",
> + dev_info(&pdev->dev, "ATP867X: ATP867 ATA UDMA133 controller (rev %02X)",
> pdev->device);
>
> host = ata_host_alloc_pinfo(&pdev->dev, ppi, ATP867X_NUM_PORTS);
>
--
Damien Le Moal
Western Digital Research
