Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/dp_dual_mode: Convert drm_dp_dual_mode_helper.c to using drm_err/drm_dbg_kms()

Next step in the conversion, move everything in drm_dp_dual_mode_helper.c
over to using drm_err() and drm_dbg_kms(). This was done using the
following cocci script:

@@
expression list expr;
@@

(
- DRM_DEBUG_KMS(expr);
+ drm_dbg_kms(dev, expr);
|
- DRM_ERROR(expr);
+ drm_err(dev, expr);
)

And correcting the indentation of the resulting code by hand.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423184309.207645-17-lyude@redhat.com
Reviewed-by: Dave Airlie <airlied@redhat.com>

+21 -24
+21 -24
drivers/gpu/drm/drm_dp_dual_mode_helper.c
··· 27 27 #include <linux/slab.h> 28 28 #include <linux/string.h> 29 29 30 + #include <drm/drm_device.h> 30 31 #include <drm/drm_dp_dual_mode_helper.h> 31 32 #include <drm/drm_print.h> 32 33 ··· 203 202 */ 204 203 ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_HDMI_ID, 205 204 hdmi_id, sizeof(hdmi_id)); 206 - DRM_DEBUG_KMS("DP dual mode HDMI ID: %*pE (err %zd)\n", 207 - ret ? 0 : (int)sizeof(hdmi_id), hdmi_id, ret); 205 + drm_dbg_kms(dev, "DP dual mode HDMI ID: %*pE (err %zd)\n", 206 + ret ? 0 : (int)sizeof(hdmi_id), hdmi_id, ret); 208 207 if (ret) 209 208 return DRM_DP_DUAL_MODE_UNKNOWN; 210 209 ··· 222 221 */ 223 222 ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_ADAPTOR_ID, 224 223 &adaptor_id, sizeof(adaptor_id)); 225 - DRM_DEBUG_KMS("DP dual mode adaptor ID: %02x (err %zd)\n", 226 - adaptor_id, ret); 224 + drm_dbg_kms(dev, "DP dual mode adaptor ID: %02x (err %zd)\n", adaptor_id, ret); 227 225 if (ret == 0) { 228 226 if (is_lspcon_adaptor(hdmi_id, adaptor_id)) 229 227 return DRM_DP_DUAL_MODE_LSPCON; ··· 238 238 * that we may have misdetected the type. 239 239 */ 240 240 if (!is_type1_adaptor(adaptor_id) && adaptor_id != hdmi_id[0]) 241 - DRM_ERROR("Unexpected DP dual mode adaptor ID %02x\n", 242 - adaptor_id); 241 + drm_err(dev, "Unexpected DP dual mode adaptor ID %02x\n", adaptor_id); 243 242 244 243 } 245 244 ··· 285 286 ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_MAX_TMDS_CLOCK, 286 287 &max_tmds_clock, sizeof(max_tmds_clock)); 287 288 if (ret || max_tmds_clock == 0x00 || max_tmds_clock == 0xff) { 288 - DRM_DEBUG_KMS("Failed to query max TMDS clock\n"); 289 + drm_dbg_kms(dev, "Failed to query max TMDS clock\n"); 289 290 return 165000; 290 291 } 291 292 ··· 325 326 ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_TMDS_OEN, 326 327 &tmds_oen, sizeof(tmds_oen)); 327 328 if (ret) { 328 - DRM_DEBUG_KMS("Failed to query state of TMDS output buffers\n"); 329 + drm_dbg_kms(dev, "Failed to query state of TMDS output buffers\n"); 329 330 return ret; 330 331 } 331 332 ··· 371 372 ret = drm_dp_dual_mode_write(adapter, DP_DUAL_MODE_TMDS_OEN, 372 373 &tmds_oen, sizeof(tmds_oen)); 373 374 if (ret) { 374 - DRM_DEBUG_KMS("Failed to %s TMDS output buffers (%d attempts)\n", 375 - enable ? "enable" : "disable", 376 - retry + 1); 375 + drm_dbg_kms(dev, "Failed to %s TMDS output buffers (%d attempts)\n", 376 + enable ? "enable" : "disable", retry + 1); 377 377 return ret; 378 378 } 379 379 380 380 ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_TMDS_OEN, 381 381 &tmp, sizeof(tmp)); 382 382 if (ret) { 383 - DRM_DEBUG_KMS("I2C read failed during TMDS output buffer %s (%d attempts)\n", 384 - enable ? "enabling" : "disabling", 385 - retry + 1); 383 + drm_dbg_kms(dev, 384 + "I2C read failed during TMDS output buffer %s (%d attempts)\n", 385 + enable ? "enabling" : "disabling", retry + 1); 386 386 return ret; 387 387 } 388 388 ··· 389 391 return 0; 390 392 } 391 393 392 - DRM_DEBUG_KMS("I2C write value mismatch during TMDS output buffer %s\n", 393 - enable ? "enabling" : "disabling"); 394 + drm_dbg_kms(dev, "I2C write value mismatch during TMDS output buffer %s\n", 395 + enable ? "enabling" : "disabling"); 394 396 395 397 return -EIO; 396 398 } ··· 444 446 int retry; 445 447 446 448 if (!mode) { 447 - DRM_ERROR("NULL input\n"); 449 + drm_err(dev, "NULL input\n"); 448 450 return -EINVAL; 449 451 } 450 452 ··· 461 463 } 462 464 463 465 if (ret < 0) { 464 - DRM_DEBUG_KMS("LSPCON read(0x80, 0x41) failed\n"); 466 + drm_dbg_kms(dev, "LSPCON read(0x80, 0x41) failed\n"); 465 467 return -EFAULT; 466 468 } 467 469 ··· 498 500 ret = drm_dp_dual_mode_write(adapter, DP_DUAL_MODE_LSPCON_MODE_CHANGE, 499 501 &data, sizeof(data)); 500 502 if (ret < 0) { 501 - DRM_ERROR("LSPCON mode change failed\n"); 503 + drm_err(dev, "LSPCON mode change failed\n"); 502 504 return ret; 503 505 } 504 506 ··· 510 512 do { 511 513 ret = drm_lspcon_get_mode(dev, adapter, &current_mode); 512 514 if (ret) { 513 - DRM_ERROR("can't confirm LSPCON mode change\n"); 515 + drm_err(dev, "can't confirm LSPCON mode change\n"); 514 516 return ret; 515 517 } else { 516 518 if (current_mode != mode) { 517 519 msleep(10); 518 520 time_out -= 10; 519 521 } else { 520 - DRM_DEBUG_KMS("LSPCON mode changed to %s\n", 521 - mode == DRM_LSPCON_MODE_LS ? 522 - "LS" : "PCON"); 522 + drm_dbg_kms(dev, "LSPCON mode changed to %s\n", 523 + mode == DRM_LSPCON_MODE_LS ? "LS" : "PCON"); 523 524 return 0; 524 525 } 525 526 } 526 527 } while (time_out); 527 528 528 - DRM_ERROR("LSPCON mode change timed out\n"); 529 + drm_err(dev, "LSPCON mode change timed out\n"); 529 530 return -ETIMEDOUT; 530 531 } 531 532 EXPORT_SYMBOL(drm_lspcon_set_mode);