summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/media/zoran/zoran_device.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c
index 61b4cfccc168..e50153218f72 100644
--- a/drivers/staging/media/zoran/zoran_device.c
+++ b/drivers/staging/media/zoran/zoran_device.c
@@ -162,7 +162,7 @@ static void dump_guests(struct zoran *zr)
for (i = 1; i < 8; i++) /* Don't read jpeg codec here */
guest[i] = post_office_read(zr, i, 0);
- pr_info("%s: Guests: %*ph\n", ZR_DEVNAME(zr), 8, guest);
+ pci_info(zr->pci_dev, "Guests: %*ph\n", 8, guest);
}
}
@@ -172,7 +172,7 @@ void detect_guest_activity(struct zoran *zr)
ktime_t t0, t1;
dump_guests(zr);
- pr_info("%s: Detecting guests activity, please wait...\n", ZR_DEVNAME(zr));
+ pci_info(zr->pci_dev, "Detecting guests activity, please wait...\n");
for (i = 1; i < 8; i++) /* Don't read jpeg codec here */
guest0[i] = guest[i] = post_office_read(zr, i, 0);
@@ -198,15 +198,14 @@ void detect_guest_activity(struct zoran *zr)
break;
}
- pr_info("%s: Guests: %*ph\n", ZR_DEVNAME(zr), 8, guest0);
+ pci_info(zr->pci_dev, "Guests: %*ph\n", 8, guest0);
if (j == 0) {
- pr_info("%s: No activity detected.\n", ZR_DEVNAME(zr));
+ pci_info(zr->pci_dev, "No activity detected.\n");
return;
}
for (i = 0; i < j; i++)
- pr_info("%s: %6d: %d => 0x%02x\n", ZR_DEVNAME(zr),
- change[i][0], change[i][1], change[i][2]);
+ pci_info(zr->pci_dev, "%6d: %d => 0x%02x\n", change[i][0], change[i][1], change[i][2]);
}
/*