git: b65172cb9ebd - main - Revert "scmi: Refactor scmi_request internal logic"

[Andrew Turner]

The branch main has been updated by andrew:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b65172cb9ebd704661dfa917e30af6658f8799f6

commit b65172cb9ebd704661dfa917e30af6658f8799f6
Author:     Andrew Turner <and...@freebsd.org>
AuthorDate: 2025-06-09 13:21:37 +0000
Commit:     Andrew Turner <and...@freebsd.org>
CommitDate: 2025-06-04 01:32:39 +0000

    Revert "scmi: Refactor scmi_request internal logic"
    
    Revert to reapply series as some patches were incorrect versions
    
    This reverts commit 341d8fd90fa084d074059051478657cb45e53402.
---
 sys/dev/firmware/arm/scmi.c | 24 ++----------------------
 sys/dev/firmware/arm/scmi.h |  1 -
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c
index 950bbf94eeb6..c24768a5668a 100644
--- a/sys/dev/firmware/arm/scmi.c
+++ b/sys/dev/firmware/arm/scmi.c
@@ -717,7 +717,7 @@ scmi_msg_put(device_t dev, struct scmi_msg *msg)
 }
 
 int
-scmi_request_tx(device_t dev, void *in)
+scmi_request(device_t dev, void *in, void **out)
 {
        struct scmi_softc *sc;
        struct scmi_req *req;
@@ -732,11 +732,8 @@ scmi_request_tx(device_t dev, void *in)
 
        /* Set inflight and send using transport specific method - refc-2 */
        error = scmi_req_track_inflight(sc, req);
-       if (error != 0) {
-               device_printf(dev, "Failed to build req with HDR |%0X|\n",
-                   req->msg.hdr);
+       if (error != 0)
                return (error);
-       }
 
        error = SCMI_XFER_MSG(sc->dev, &req->msg);
        if (error != 0) {
@@ -744,22 +741,5 @@ scmi_request_tx(device_t dev, void *in)
                return (error);
        }
 
-       return (0);
-}
-
-int
-scmi_request(device_t dev, void *in, void **out)
-{
-       struct scmi_softc *sc;
-       struct scmi_req *req;
-       int error;
-
-       error = scmi_request_tx(dev, in);
-       if (error != 0)
-               return (error);
-
-       sc = device_get_softc(dev);
-       req = buf_to_req(in);
-
        return (scmi_wait_for_response(sc, req, out));
 }
diff --git a/sys/dev/firmware/arm/scmi.h b/sys/dev/firmware/arm/scmi.h
index f5b4173272bb..f6aa072caeca 100644
--- a/sys/dev/firmware/arm/scmi.h
+++ b/sys/dev/firmware/arm/scmi.h
@@ -83,7 +83,6 @@ void scmi_buf_put(device_t dev, void *buf);
 struct scmi_msg *scmi_msg_get(device_t dev, int tx_payld_sz, int rx_payld_sz);
 void scmi_msg_put(device_t dev, struct scmi_msg *msg);
 int scmi_request(device_t dev, void *in, void **);
-int scmi_request_tx(device_t dev, void *in);
 void scmi_rx_irq_callback(device_t dev, void *chan, uint32_t hdr, uint32_t 
rx_len);
 
 DECLARE_CLASS(scmi_driver);