usb: typec: ucsi: acpi: move LG Gram quirk to ucsi_gram_sync_control()

It is easier to keep all command-specific quirks in a single place. Move
them to ucsi_gram_sync_control() as the code now allows us to return
modified messages data.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250120-ucsi-merge-commands-v2-3-462a1ec22ecc@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
index 8b02082201ec5b85031472563b8b8d1eea6134de..ada5d0d21ee6fb1f406b6a8b8466bc71ffdb5b46 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -99,17 +99,23 @@ static const struct ucsi_operations ucsi_acpi_ops = {
        .async_control = ucsi_acpi_async_control
 };
 
-static int ucsi_gram_read_message_in(struct ucsi *ucsi, void *val, size_t val_len)
+static int ucsi_gram_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
+                                 void *val, size_t len)
 {
        u16 bogus_change = UCSI_CONSTAT_POWER_LEVEL_CHANGE |
                           UCSI_CONSTAT_PDOS_CHANGE;
        struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
        int ret;
 
-       ret = ucsi_acpi_read_message_in(ucsi, val, val_len);
+       ret = ucsi_sync_control_common(ucsi, command, cci, val, len);
        if (ret < 0)
                return ret;
 
+       if (UCSI_COMMAND(ua->cmd) == UCSI_GET_PDOS &&
+           ua->cmd & UCSI_GET_PDOS_PARTNER_PDO(1) &&
+           ua->cmd & UCSI_GET_PDOS_SRC_PDOS)
+               ua->check_bogus_event = true;
+
        if (UCSI_COMMAND(ua->cmd) == UCSI_GET_CONNECTOR_STATUS &&
            ua->check_bogus_event) {
                /* Clear the bogus change */
@@ -122,28 +128,10 @@ static int ucsi_gram_read_message_in(struct ucsi *ucsi, void *val, size_t val_le
        return ret;
 }
 
-static int ucsi_gram_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,
-                                 void *data, size_t size)
-{
-       struct ucsi_acpi *ua = ucsi_get_drvdata(ucsi);
-       int ret;
-
-       ret = ucsi_sync_control_common(ucsi, command, cci, data, size);
-       if (ret < 0)
-               return ret;
-
-       if (UCSI_COMMAND(ua->cmd) == UCSI_GET_PDOS &&
-           ua->cmd & UCSI_GET_PDOS_PARTNER_PDO(1) &&
-           ua->cmd & UCSI_GET_PDOS_SRC_PDOS)
-               ua->check_bogus_event = true;
-
-       return ret;
-}
-
 static const struct ucsi_operations ucsi_gram_ops = {
        .read_version = ucsi_acpi_read_version,
        .read_cci = ucsi_acpi_read_cci,
-       .read_message_in = ucsi_gram_read_message_in,
+       .read_message_in = ucsi_acpi_read_message_in,
        .sync_control = ucsi_gram_sync_control,
        .async_control = ucsi_acpi_async_control
 };