summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/drm/i915/dvo_ch7017.c8
-rw-r--r--sys/dev/pci/drm/i915/dvo_ch7xxx.c16
-rw-r--r--sys/dev/pci/drm/i915/dvo_ivch.c8
-rw-r--r--sys/dev/pci/drm/i915/dvo_ns2501.c16
-rw-r--r--sys/dev/pci/drm/i915/dvo_sil164.c16
-rw-r--r--sys/dev/pci/drm/i915/dvo_tfp410.c16
6 files changed, 40 insertions, 40 deletions
diff --git a/sys/dev/pci/drm/i915/dvo_ch7017.c b/sys/dev/pci/drm/i915/dvo_ch7017.c
index e9c048edd36..292699327da 100644
--- a/sys/dev/pci/drm/i915/dvo_ch7017.c
+++ b/sys/dev/pci/drm/i915/dvo_ch7017.c
@@ -247,14 +247,14 @@ ch7017_init(struct intel_dvo_device *dvo,
str = "ch7019";
break;
default:
- DRM_DEBUG_KMS("ch701x not detected, got %d: from %s "
+ DRM_DEBUG_KMS("ch701x not detected, got %d: from "
"slave %d.\n",
- val, adapter->name, dvo->slave_addr);
+ val, dvo->slave_addr);
goto fail;
}
- DRM_DEBUG_KMS("%s detected on %s, addr %d\n",
- str, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("%s detected, addr %d\n",
+ str, dvo->slave_addr);
return true;
fail:
diff --git a/sys/dev/pci/drm/i915/dvo_ch7xxx.c b/sys/dev/pci/drm/i915/dvo_ch7xxx.c
index 3091f829bc6..71943c1b189 100644
--- a/sys/dev/pci/drm/i915/dvo_ch7xxx.c
+++ b/sys/dev/pci/drm/i915/dvo_ch7xxx.c
@@ -155,8 +155,8 @@ ch7xxx_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)
read_err:
iic_release_bus(adapter, 0);
if (!ch7xxx->quiet) {
- DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to read register 0x%02x from %02x.\n",
+ addr, dvo->slave_addr);
}
return false;
}
@@ -185,8 +185,8 @@ ch7xxx_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
write_err:
if (!ch7xxx->quiet) {
- DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+ addr, dvo->slave_addr);
}
return false;
@@ -214,9 +214,9 @@ ch7xxx_init(struct intel_dvo_device *dvo,
name = ch7xxx_get_id(vendor);
if (!name) {
- DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s "
+ DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from "
"slave %d.\n",
- vendor, adapter->name, dvo->slave_addr);
+ vendor, dvo->slave_addr);
goto out;
}
@@ -225,9 +225,9 @@ ch7xxx_init(struct intel_dvo_device *dvo,
goto out;
if (device != CH7xxx_DID) {
- DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s "
+ DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x "
"slave %d.\n",
- vendor, adapter->name, dvo->slave_addr);
+ vendor, dvo->slave_addr);
goto out;
}
diff --git a/sys/dev/pci/drm/i915/dvo_ivch.c b/sys/dev/pci/drm/i915/dvo_ivch.c
index 16130dce1bc..eb8e74829f7 100644
--- a/sys/dev/pci/drm/i915/dvo_ivch.c
+++ b/sys/dev/pci/drm/i915/dvo_ivch.c
@@ -209,8 +209,8 @@ read_err:
iic_release_bus(adapter, 0);
if (!priv->quiet) {
DRM_DEBUG_KMS("Unable to read register 0x%02x from "
- "%s:%02x.\n",
- addr, adapter->name, dvo->slave_addr);
+ "%02x.\n",
+ addr, dvo->slave_addr);
}
return false;
}
@@ -240,8 +240,8 @@ ivch_write(struct intel_dvo_device *dvo, int addr, uint16_t data)
write_err:
if (!priv->quiet) {
- DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+ addr, dvo->slave_addr);
}
return false;
diff --git a/sys/dev/pci/drm/i915/dvo_ns2501.c b/sys/dev/pci/drm/i915/dvo_ns2501.c
index 4dea64313d3..f1909992d9d 100644
--- a/sys/dev/pci/drm/i915/dvo_ns2501.c
+++ b/sys/dev/pci/drm/i915/dvo_ns2501.c
@@ -185,8 +185,8 @@ read_err:
iic_release_bus(adapter, 0);
if (!ns->quiet) {
DRM_DEBUG_KMS
- ("Unable to read register 0x%02x from %s:0x%02x.\n", addr,
- adapter->name, dvo->slave_addr);
+ ("Unable to read register 0x%02x from 0x%02x.\n", addr,
+ dvo->slave_addr);
}
return false;
@@ -221,8 +221,8 @@ ns2501_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
write_err:
if (!ns->quiet) {
- DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to write register 0x%02x to %d\n",
+ addr, dvo->slave_addr);
}
return false;
@@ -254,8 +254,8 @@ ns2501_init(struct intel_dvo_device *dvo,
goto out;
if (ch != (NS2501_VID & 0xff)) {
- DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",
- ch, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("ns2501 not detected got %d: from Slave %d.\n",
+ ch, dvo->slave_addr);
goto out;
}
@@ -263,8 +263,8 @@ ns2501_init(struct intel_dvo_device *dvo,
goto out;
if (ch != (NS2501_DID & 0xff)) {
- DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",
- ch, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("ns2501 not detected got %d: from Slave %d.\n",
+ ch, dvo->slave_addr);
goto out;
}
ns->quiet = false;
diff --git a/sys/dev/pci/drm/i915/dvo_sil164.c b/sys/dev/pci/drm/i915/dvo_sil164.c
index b317784b3df..c62130cd447 100644
--- a/sys/dev/pci/drm/i915/dvo_sil164.c
+++ b/sys/dev/pci/drm/i915/dvo_sil164.c
@@ -109,8 +109,8 @@ sil164_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)
read_err:
iic_release_bus(adapter, 0);
if (!sil->quiet) {
- DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to read register 0x%02x from %02x.\n",
+ addr, dvo->slave_addr);
}
return false;
}
@@ -138,8 +138,8 @@ sil164_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
write_err:
if (!sil->quiet) {
- DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+ addr, dvo->slave_addr);
}
return false;
@@ -166,8 +166,8 @@ sil164_init(struct intel_dvo_device *dvo,
goto out;
if (ch != (SIL164_VID & 0xff)) {
- DRM_DEBUG_KMS("sil164 not detected got %d: from %s Slave %d.\n",
- ch, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("sil164 not detected got %d: from Slave %d.\n",
+ ch, dvo->slave_addr);
goto out;
}
@@ -175,8 +175,8 @@ sil164_init(struct intel_dvo_device *dvo,
goto out;
if (ch != (SIL164_DID & 0xff)) {
- DRM_DEBUG_KMS("sil164 not detected got %d: from %s Slave %d.\n",
- ch, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("sil164 not detected got %d: from Slave %d.\n",
+ ch, dvo->slave_addr);
goto out;
}
sil->quiet = false;
diff --git a/sys/dev/pci/drm/i915/dvo_tfp410.c b/sys/dev/pci/drm/i915/dvo_tfp410.c
index f8e0ee320ba..f25d6f8dfa4 100644
--- a/sys/dev/pci/drm/i915/dvo_tfp410.c
+++ b/sys/dev/pci/drm/i915/dvo_tfp410.c
@@ -135,8 +135,8 @@ tfp410_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)
read_err:
iic_release_bus(adapter, 0);
if (!tfp->quiet) {
- DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to read register 0x%02x from %02x.\n",
+ addr, dvo->slave_addr);
}
return false;
}
@@ -164,8 +164,8 @@ tfp410_writeb(struct intel_dvo_device *dvo, int addr, uint8_t ch)
write_err:
if (!tfp->quiet) {
- DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",
- addr, adapter->name, dvo->slave_addr);
+ DRM_DEBUG_KMS("Unable to write register 0x%02x to %d.\n",
+ addr, dvo->slave_addr);
}
return false;
@@ -201,16 +201,16 @@ tfp410_init(struct intel_dvo_device *dvo,
tfp->quiet = true;
if ((id = tfp410_getid(dvo, TFP410_VID_LO)) != TFP410_VID) {
- DRM_DEBUG_KMS("tfp410 not detected got VID %X: from %s "
+ DRM_DEBUG_KMS("tfp410 not detected got VID %X: from "
"Slave %d.\n",
- id, adapter->name, dvo->slave_addr);
+ id, dvo->slave_addr);
goto out;
}
if ((id = tfp410_getid(dvo, TFP410_DID_LO)) != TFP410_DID) {
- DRM_DEBUG_KMS("tfp410 not detected got DID %X: from %s "
+ DRM_DEBUG_KMS("tfp410 not detected got DID %X: from "
"Slave %d.\n",
- id, adapter->name, dvo->slave_addr);
+ id, dvo->slave_addr);
goto out;
}
tfp->quiet = false;