Replace all printk() calls with appropriate device-aware logging functions to properly associate log messages with the PCI device.
- Use pci_err() for errors where struct pci_dev is available - Use pci_info() for info messages where struct pci_dev is available - Use dev_err() for errors where only struct fb_info is available Remove redundant 's3d:' prefix and pci_name() calls as device-aware functions include device identification automatically. Assisted-by: Claude:claude-sonnet-4-6 Signed-off-by: Rahman Mahmutović <[email protected]> --- drivers/video/fbdev/sunxvr2500.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/video/fbdev/sunxvr2500.c b/drivers/video/fbdev/sunxvr2500.c index 42426d09b..3a36e7524 100644 --- a/drivers/video/fbdev/sunxvr2500.c +++ b/drivers/video/fbdev/sunxvr2500.c @@ -38,8 +38,7 @@ static int s3d_get_props(struct s3d_info *sp) sp->depth = of_getintprop_default(sp->of_node, "depth", 8); if (!sp->width || !sp->height) { - printk(KERN_ERR "s3d: Critical properties missing for %s\n", - pci_name(sp->pdev)); + pci_err(sp->pdev, "Critical properties missing\n"); return -EINVAL; } @@ -107,7 +106,7 @@ static int s3d_set_fbinfo(struct s3d_info *sp) var->transp.length = 0; if (fb_alloc_cmap(&info->cmap, 256, 0)) { - printk(KERN_ERR "s3d: Cannot allocate color map.\n"); + dev_err(info->dev, "Cannot allocate color map\n"); return -ENOMEM; } @@ -127,8 +126,7 @@ static int s3d_pci_register(struct pci_dev *pdev, err = pci_enable_device(pdev); if (err < 0) { - printk(KERN_ERR "s3d: Cannot enable PCI device %s\n", - pci_name(pdev)); + pci_err(pdev, "Cannot enable PCI device\n"); goto err_out; } @@ -143,8 +141,7 @@ static int s3d_pci_register(struct pci_dev *pdev, sp->pdev = pdev; sp->of_node = pci_device_to_OF_node(pdev); if (!sp->of_node) { - printk(KERN_ERR "s3d: Cannot find OF node of %s\n", - pci_name(pdev)); + pci_err(pdev, "Cannot find OF node\n"); err = -ENODEV; goto err_release_fb; } @@ -153,8 +150,7 @@ static int s3d_pci_register(struct pci_dev *pdev, err = pci_request_region(pdev, 1, "s3d framebuffer"); if (err < 0) { - printk("s3d: Cannot request region 1 for %s\n", - pci_name(pdev)); + pci_err(pdev, "Cannot request region 1\n"); goto err_release_fb; } @@ -194,12 +190,11 @@ static int s3d_pci_register(struct pci_dev *pdev, pci_set_drvdata(pdev, info); - printk("s3d: Found device at %s\n", pci_name(pdev)); + pci_info(pdev, "Found device\n"); err = register_framebuffer(info); if (err < 0) { - printk(KERN_ERR "s3d: Could not register framebuffer %s\n", - pci_name(pdev)); + pci_err(pdev, "Could not register framebuffer\n"); goto err_unmap_fb; } -- 2.43.0
