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

Configure Feed

Select the types of activity you want to include in your feed.

mei: bus: use cldev in prints

For unifomity, print using client device on bus where possible.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Link: https://lore.kernel.org/r/20250717141112.1696482-2-alexander.usyskin@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Alexander Usyskin and committed by
Greg Kroah-Hartman 3fd97f22 34120f7f

+14 -14
+5 -5
drivers/misc/mei/bus-fixup.c
··· 463 463 if (IS_ERR(cl)) { 464 464 ret = PTR_ERR(cl); 465 465 cl = NULL; 466 - dev_err(bus->dev, "nfc hook alloc failed %d\n", ret); 466 + dev_err(&cldev->dev, "nfc hook alloc failed %d\n", ret); 467 467 goto out; 468 468 } 469 469 470 470 me_cl = mei_me_cl_by_uuid(bus, &mei_nfc_info_guid); 471 471 if (!me_cl) { 472 472 ret = -ENOTTY; 473 - dev_err(bus->dev, "Cannot find nfc info %d\n", ret); 473 + dev_err(&cldev->dev, "Cannot find nfc info %d\n", ret); 474 474 goto out; 475 475 } 476 476 ··· 496 496 goto disconnect; 497 497 } 498 498 499 - dev_dbg(bus->dev, "nfc radio %s\n", radio_name); 499 + dev_dbg(&cldev->dev, "nfc radio %s\n", radio_name); 500 500 strscpy(cldev->name, radio_name, sizeof(cldev->name)); 501 501 502 502 disconnect: 503 503 mutex_lock(&bus->device_lock); 504 504 if (mei_cl_disconnect(cl) < 0) 505 - dev_err(bus->dev, "Can't disconnect the NFC INFO ME\n"); 505 + dev_err(&cldev->dev, "Can't disconnect the NFC INFO ME\n"); 506 506 507 507 mei_cl_flush_queues(cl, NULL); 508 508 ··· 515 515 if (ret) 516 516 cldev->do_match = 0; 517 517 518 - dev_dbg(bus->dev, "end of fixup match = %d\n", cldev->do_match); 518 + dev_dbg(&cldev->dev, "end of fixup match = %d\n", cldev->do_match); 519 519 } 520 520 521 521 /**
+9 -9
drivers/misc/mei/bus.c
··· 875 875 mei_cl_bus_vtag_free(cldev); 876 876 877 877 if (!mei_cl_is_connected(cl)) { 878 - dev_dbg(bus->dev, "Already disconnected\n"); 878 + dev_dbg(&cldev->dev, "Already disconnected\n"); 879 879 err = 0; 880 880 goto out; 881 881 } 882 882 883 883 err = mei_cl_disconnect(cl); 884 884 if (err < 0) 885 - dev_err(bus->dev, "Could not disconnect from the ME client\n"); 885 + dev_err(&cldev->dev, "Could not disconnect from the ME client\n"); 886 886 887 887 out: 888 888 /* Flush queues and remove any pending read unless we have mapped DMA */ ··· 935 935 cl = cldev->cl; 936 936 bus = cldev->bus; 937 937 938 - dev_dbg(bus->dev, "client_id %u, fence_id %u\n", client_id, fence_id); 938 + dev_dbg(&cldev->dev, "client_id %u, fence_id %u\n", client_id, fence_id); 939 939 940 940 if (!bus->hbm_f_gsc_supported) 941 941 return -EOPNOTSUPP; ··· 983 983 /* send the message to GSC */ 984 984 ret = __mei_cl_send(cl, (u8 *)ext_hdr, buf_sz, 0, MEI_CL_IO_SGL); 985 985 if (ret < 0) { 986 - dev_err(bus->dev, "__mei_cl_send failed, returned %zd\n", ret); 986 + dev_err(&cldev->dev, "__mei_cl_send failed, returned %zd\n", ret); 987 987 goto end; 988 988 } 989 989 if (ret != buf_sz) { 990 - dev_err(bus->dev, "__mei_cl_send returned %zd instead of expected %zd\n", 990 + dev_err(&cldev->dev, "__mei_cl_send returned %zd instead of expected %zd\n", 991 991 ret, buf_sz); 992 992 ret = -EIO; 993 993 goto end; ··· 997 997 ret = __mei_cl_recv(cl, (u8 *)&rx_msg, sizeof(rx_msg), NULL, MEI_CL_IO_SGL, 0); 998 998 999 999 if (ret != sizeof(rx_msg)) { 1000 - dev_err(bus->dev, "__mei_cl_recv returned %zd instead of expected %zd\n", 1000 + dev_err(&cldev->dev, "__mei_cl_recv returned %zd instead of expected %zd\n", 1001 1001 ret, sizeof(rx_msg)); 1002 1002 if (ret >= 0) 1003 1003 ret = -EIO; ··· 1006 1006 1007 1007 /* check rx_msg.client_id and rx_msg.fence_id match the ones we send */ 1008 1008 if (rx_msg.client_id != client_id || rx_msg.fence_id != fence_id) { 1009 - dev_err(bus->dev, "received client_id/fence_id %u/%u instead of %u/%u sent\n", 1009 + dev_err(&cldev->dev, "received client_id/fence_id %u/%u instead of %u/%u sent\n", 1010 1010 rx_msg.client_id, rx_msg.fence_id, client_id, fence_id); 1011 1011 ret = -EFAULT; 1012 1012 goto end; 1013 1013 } 1014 1014 1015 - dev_dbg(bus->dev, "gsc command: successfully written %u bytes\n", rx_msg.written); 1015 + dev_dbg(&cldev->dev, "gsc command: successfully written %u bytes\n", rx_msg.written); 1016 1016 ret = rx_msg.written; 1017 1017 1018 1018 end: ··· 1404 1404 { 1405 1405 int ret; 1406 1406 1407 - dev_dbg(cldev->bus->dev, "adding %pUL:%02X\n", 1407 + dev_dbg(&cldev->dev, "adding %pUL:%02X\n", 1408 1408 mei_me_cl_uuid(cldev->me_cl), 1409 1409 mei_me_cl_ver(cldev->me_cl)); 1410 1410 ret = device_add(&cldev->dev);