HID: mcp2221: use mcp_i2c_smbus_read for block reads

Refactor mcp_smbus_xfer() to use the mcp_i2c_smbus_read() helper function
for I2C_SMBUS_BLOCK_DATA and I2C_SMBUS_I2C_BLOCK_DATA read operations.

This replaces the manual setup of the receive buffer and explicit calls
to mcp_send_data_req_status(), making the code cleaner and more consistent
with other read paths in the driver.

Signed-off-by: Romain Sioen <romain.sioen@microchip.com>
Signed-off-by: Marius Cristea <marius.cristea@microchip.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-mcp2221.c b/drivers/hid/hid-mcp2221.c
index 33603b019f975edc60e44615566a0f7efa5a3f25..64dcedbcc0fc9b90f586cd9024c62ea0c14c914e 100644 (file)
--- a/drivers/hid/hid-mcp2221.c
+++ b/drivers/hid/hid-mcp2221.c
@@ -534,10 +534,10 @@ static int mcp_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
                        if (ret)
                                goto exit;
 
-                       mcp->rxbuf_idx = 0;
-                       mcp->rxbuf = data->block;
-                       mcp->txbuf[0] = MCP2221_I2C_GET_DATA;
-                       ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1);
+                       ret = mcp_i2c_smbus_read(mcp, NULL,
+                                               MCP2221_I2C_RD_RPT_START,
+                                               addr, data->block[0] + 1,
+                                               data->block);
                        if (ret)
                                goto exit;
                } else {
@@ -553,14 +553,14 @@ static int mcp_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
        case I2C_SMBUS_I2C_BLOCK_DATA:
                if (read_write == I2C_SMBUS_READ) {
                        ret = mcp_smbus_write(mcp, addr, command, NULL,
-                                               0, MCP2221_I2C_WR_NO_STOP, 1);
+                                               0, MCP2221_I2C_WR_NO_STOP, 0);
                        if (ret)
                                goto exit;
 
-                       mcp->rxbuf_idx = 0;
-                       mcp->rxbuf = data->block;
-                       mcp->txbuf[0] = MCP2221_I2C_GET_DATA;
-                       ret = mcp_send_data_req_status(mcp, mcp->txbuf, 1);
+                       ret = mcp_i2c_smbus_read(mcp, NULL,
+                                               MCP2221_I2C_RD_RPT_START,
+                                               addr, data->block[0],
+                                               &data->block[1]);
                        if (ret)
                                goto exit;
                } else {