---

yaml
---
r: 307005
b: refs/heads/master
c: 874e3cc
h: refs/heads/master
i:
  307003: 7c40092
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 924a93edc96b7f7e08a0af7a2f9afe4827bab103
+refs/heads/master: 874e3cc90ba2fe1420945c1ac93781aa8dd33b53

trunk/drivers/gpu/drm/i915/intel_i2c.c

@@ -333,17 +333,20 @@ gmbus_xfer(struct i2c_adapter *adapter,
 	 * till then let it sleep.
 	 */
 	if (wait_for((I915_READ(GMBUS2 + reg_offset) & GMBUS_ACTIVE) == 0, 10))
-		DRM_INFO("GMBUS timed out waiting for idle\n");
+		DRM_INFO("GMBUS [%s] timed out waiting for idle\n",
+			 bus->adapter.name);
 	I915_WRITE(GMBUS0 + reg_offset, 0);
 	ret = i;
 	goto out;
 
 timeout:
-	DRM_INFO("GMBUS timed out, falling back to bit banging on pin %d [%s]\n",
-		 bus->reg0 & 0xff, bus->adapter.name);
+	DRM_INFO("GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
+		 bus->adapter.name, bus->reg0 & 0xff);
 	I915_WRITE(GMBUS0 + reg_offset, 0);
 
-	/* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */
+	/* Hardware may not support GMBUS over these pins?
+	 * Try GPIO bitbanging instead.
+	 */
 	if (!bus->has_gpio) {
 		ret = -EIO;
 	} else {