net: dsa: sja1105: Rename sja1105_spi_send_packed_buf to sja1105_xfer_buf

The most commonly called function in the driver is long due for a
rename. The "packed" word is redundant (it doesn't make sense to
transfer an unpacked structure, since that is in CPU endianness yadda
yadda), and the "spi" word is also redundant since argument 2 of the
function is SPI_READ or SPI_WRITE.

As for the sja1105_spi_send_long_packed_buf function, it is only being
used from sja1105_spi.c, so remove its global prototype.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h
index cba0beb87d9c0472e0ab15e7ef62c4f9d47e8cd9..8681ff9d1a76ecca549ea55c23cea92043f27873 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105.h
+++ b/drivers/net/dsa/sja1105/sja1105.h
@@ -127,16 +127,13 @@ typedef enum {
 int sja1105_static_config_reload(struct sja1105_private *priv);
 
 /* From sja1105_spi.c */
-int sja1105_spi_send_packed_buf(const struct sja1105_private *priv,
-                               sja1105_spi_rw_mode_t rw, u64 reg_addr,
-                               void *packed_buf, size_t size_bytes);
+int sja1105_xfer_buf(const struct sja1105_private *priv,
+                    sja1105_spi_rw_mode_t rw, u64 reg_addr,
+                    void *packed_buf, size_t size_bytes);
 int sja1105_xfer_u32(const struct sja1105_private *priv,
                     sja1105_spi_rw_mode_t rw, u64 reg_addr, u32 *value);
 int sja1105_xfer_u64(const struct sja1105_private *priv,
                     sja1105_spi_rw_mode_t rw, u64 reg_addr, u64 *value);
-int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,
-                                    sja1105_spi_rw_mode_t rw, u64 base_addr,
-                                    void *packed_buf, u64 buf_len);
 int sja1105_static_config_upload(struct sja1105_private *priv);
 int sja1105_inhibit_tx(const struct sja1105_private *priv,
                       unsigned long port_bitmap, bool tx_inhibited);

diff --git a/drivers/net/dsa/sja1105/sja1105_clocking.c b/drivers/net/dsa/sja1105/sja1105_clocking.c
index 2903f5dbd182663fdca15ee9e4ef2390b8cf6b7b..9082e52b55e92b8e489607d0e27b5c17db1934f6 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_clocking.c
+++ b/drivers/net/dsa/sja1105/sja1105_clocking.c
@@ -118,9 +118,8 @@ static int sja1105_cgu_idiv_config(struct sja1105_private *priv, int port,
        idiv.pd        = enabled ? 0 : 1; /* Power down? */
        sja1105_cgu_idiv_packing(packed_buf, &idiv, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->cgu_idiv[port], packed_buf,
-                                          SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->cgu_idiv[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static void
@@ -167,9 +166,8 @@ static int sja1105_cgu_mii_tx_clk_config(struct sja1105_private *priv,
        mii_tx_clk.pd        = 0;  /* Power Down off => enabled */
        sja1105_cgu_mii_control_packing(packed_buf, &mii_tx_clk, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->mii_tx_clk[port], packed_buf,
-                                          SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->mii_tx_clk[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static int
@@ -192,9 +190,8 @@ sja1105_cgu_mii_rx_clk_config(struct sja1105_private *priv, int port)
        mii_rx_clk.pd        = 0;  /* Power Down off => enabled */
        sja1105_cgu_mii_control_packing(packed_buf, &mii_rx_clk, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->mii_rx_clk[port], packed_buf,
-                                          SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->mii_rx_clk[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static int
@@ -217,9 +214,8 @@ sja1105_cgu_mii_ext_tx_clk_config(struct sja1105_private *priv, int port)
        mii_ext_tx_clk.pd        = 0; /* Power Down off => enabled */
        sja1105_cgu_mii_control_packing(packed_buf, &mii_ext_tx_clk, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->mii_ext_tx_clk[port],
-                                          packed_buf, SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->mii_ext_tx_clk[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static int
@@ -242,9 +238,8 @@ sja1105_cgu_mii_ext_rx_clk_config(struct sja1105_private *priv, int port)
        mii_ext_rx_clk.pd        = 0; /* Power Down off => enabled */
        sja1105_cgu_mii_control_packing(packed_buf, &mii_ext_rx_clk, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->mii_ext_rx_clk[port],
-                                          packed_buf, SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->mii_ext_rx_clk[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static int sja1105_mii_clocking_setup(struct sja1105_private *priv, int port,
@@ -337,9 +332,8 @@ static int sja1105_cgu_rgmii_tx_clk_config(struct sja1105_private *priv,
        txc.pd = 0;
        sja1105_cgu_mii_control_packing(packed_buf, &txc, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->rgmii_tx_clk[port],
-                                          packed_buf, SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->rgmii_tx_clk[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 /* AGU */
@@ -383,9 +377,8 @@ static int sja1105_rgmii_cfg_pad_tx_config(struct sja1105_private *priv,
        pad_mii_tx.clk_ipud  = 2; /* TX_CLK input stage (default) */
        sja1105_cfg_pad_mii_tx_packing(packed_buf, &pad_mii_tx, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->pad_mii_tx[port],
-                                          packed_buf, SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->pad_mii_tx[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static void
@@ -442,9 +435,8 @@ int sja1105pqrs_setup_rgmii_delay(const void *ctx, int port)
        pad_mii_id.txc_pd = 1;
        sja1105_cfg_pad_mii_id_packing(packed_buf, &pad_mii_id, PACK);
 
-       rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                        regs->pad_mii_id[port],
-                                        packed_buf, SJA1105_SIZE_CGU_CMD);
+       rc = sja1105_xfer_buf(priv, SPI_WRITE, regs->pad_mii_id[port],
+                             packed_buf, SJA1105_SIZE_CGU_CMD);
        if (rc < 0)
                return rc;
 
@@ -459,9 +451,8 @@ int sja1105pqrs_setup_rgmii_delay(const void *ctx, int port)
        }
        sja1105_cfg_pad_mii_id_packing(packed_buf, &pad_mii_id, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->pad_mii_id[port],
-                                          packed_buf, SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->pad_mii_id[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static int sja1105_rgmii_clocking_setup(struct sja1105_private *priv, int port,
@@ -547,9 +538,8 @@ static int sja1105_cgu_rmii_ref_clk_config(struct sja1105_private *priv,
        ref_clk.pd        = 0;      /* Power Down off => enabled */
        sja1105_cgu_mii_control_packing(packed_buf, &ref_clk, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->rmii_ref_clk[port],
-                                          packed_buf, SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->rmii_ref_clk[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static int
@@ -565,9 +555,8 @@ sja1105_cgu_rmii_ext_tx_clk_config(struct sja1105_private *priv, int port)
        ext_tx_clk.pd        = 0;   /* Power Down off => enabled */
        sja1105_cgu_mii_control_packing(packed_buf, &ext_tx_clk, PACK);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE,
-                                          regs->rmii_ext_tx_clk[port],
-                                          packed_buf, SJA1105_SIZE_CGU_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->rmii_ext_tx_clk[port],
+                               packed_buf, SJA1105_SIZE_CGU_CMD);
 }
 
 static int sja1105_cgu_rmii_pll_config(struct sja1105_private *priv)
@@ -595,8 +584,8 @@ static int sja1105_cgu_rmii_pll_config(struct sja1105_private *priv)
        pll.pd        = 0x1;
 
        sja1105_cgu_pll_control_packing(packed_buf, &pll, PACK);
-       rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs->rmii_pll1,
-                                        packed_buf, SJA1105_SIZE_CGU_CMD);
+       rc = sja1105_xfer_buf(priv, SPI_WRITE, regs->rmii_pll1, packed_buf,
+                             SJA1105_SIZE_CGU_CMD);
        if (rc < 0) {
                dev_err(dev, "failed to configure PLL1 for 50MHz\n");
                return rc;
@@ -606,8 +595,8 @@ static int sja1105_cgu_rmii_pll_config(struct sja1105_private *priv)
        pll.pd = 0x0;
 
        sja1105_cgu_pll_control_packing(packed_buf, &pll, PACK);
-       rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs->rmii_pll1,
-                                        packed_buf, SJA1105_SIZE_CGU_CMD);
+       rc = sja1105_xfer_buf(priv, SPI_WRITE, regs->rmii_pll1, packed_buf,
+                             SJA1105_SIZE_CGU_CMD);
        if (rc < 0) {
                dev_err(dev, "failed to enable PLL1\n");
                return rc;

diff --git a/drivers/net/dsa/sja1105/sja1105_dynamic_config.c b/drivers/net/dsa/sja1105/sja1105_dynamic_config.c
index 91da430045ff2aebb152ea7f32824e2b9cc10547..25381bd65ed792ba2eed610a3744a714d6bdfe19 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_dynamic_config.c
+++ b/drivers/net/dsa/sja1105/sja1105_dynamic_config.c
@@ -686,8 +686,8 @@ int sja1105_dynamic_config_read(struct sja1105_private *priv,
                ops->entry_packing(packed_buf, entry, PACK);
 
        /* Send SPI write operation: read config table entry */
-       rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, ops->addr,
-                                        packed_buf, ops->packed_size);
+       rc = sja1105_xfer_buf(priv, SPI_WRITE, ops->addr, packed_buf,
+                             ops->packed_size);
        if (rc < 0)
                return rc;
 
@@ -698,8 +698,8 @@ int sja1105_dynamic_config_read(struct sja1105_private *priv,
                memset(packed_buf, 0, ops->packed_size);
 
                /* Retrieve the read operation's result */
-               rc = sja1105_spi_send_packed_buf(priv, SPI_READ, ops->addr,
-                                                packed_buf, ops->packed_size);
+               rc = sja1105_xfer_buf(priv, SPI_READ, ops->addr, packed_buf,
+                                     ops->packed_size);
                if (rc < 0)
                        return rc;
 
@@ -771,8 +771,8 @@ int sja1105_dynamic_config_write(struct sja1105_private *priv,
                ops->entry_packing(packed_buf, entry, PACK);
 
        /* Send SPI write operation: read config table entry */
-       rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, ops->addr,
-                                        packed_buf, ops->packed_size);
+       rc = sja1105_xfer_buf(priv, SPI_WRITE, ops->addr, packed_buf,
+                             ops->packed_size);
        if (rc < 0)
                return rc;
 

diff --git a/drivers/net/dsa/sja1105/sja1105_ethtool.c b/drivers/net/dsa/sja1105/sja1105_ethtool.c
index ab581a28cd41710bf44721761bd02674ead4c1e0..064301cc7d5b280fd70d1ec6a0370f5195065423 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_ethtool.c
+++ b/drivers/net/dsa/sja1105/sja1105_ethtool.c
@@ -167,8 +167,8 @@ static int sja1105_port_status_get_mac(struct sja1105_private *priv,
        int rc;
 
        /* MAC area */
-       rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs->mac[port],
-                                        packed_buf, SJA1105_SIZE_MAC_AREA);
+       rc = sja1105_xfer_buf(priv, SPI_READ, regs->mac[port], packed_buf,
+                             SJA1105_SIZE_MAC_AREA);
        if (rc < 0)
                return rc;
 
@@ -185,8 +185,8 @@ static int sja1105_port_status_get_hl1(struct sja1105_private *priv,
        u8 packed_buf[SJA1105_SIZE_HL1_AREA] = {0};
        int rc;
 
-       rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs->mac_hl1[port],
-                                        packed_buf, SJA1105_SIZE_HL1_AREA);
+       rc = sja1105_xfer_buf(priv, SPI_READ, regs->mac_hl1[port], packed_buf,
+                             SJA1105_SIZE_HL1_AREA);
        if (rc < 0)
                return rc;
 
@@ -203,8 +203,8 @@ static int sja1105_port_status_get_hl2(struct sja1105_private *priv,
        u8 packed_buf[SJA1105_SIZE_QLEVEL_AREA] = {0};
        int rc;
 
-       rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs->mac_hl2[port],
-                                        packed_buf, SJA1105_SIZE_HL2_AREA);
+       rc = sja1105_xfer_buf(priv, SPI_READ, regs->mac_hl2[port], packed_buf,
+                             SJA1105_SIZE_HL2_AREA);
        if (rc < 0)
                return rc;
 
@@ -215,8 +215,8 @@ static int sja1105_port_status_get_hl2(struct sja1105_private *priv,
            priv->info->device_id == SJA1105T_DEVICE_ID)
                return 0;
 
-       rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs->qlevel[port],
-                                        packed_buf, SJA1105_SIZE_QLEVEL_AREA);
+       rc = sja1105_xfer_buf(priv, SPI_READ, regs->qlevel[port], packed_buf,
+                             SJA1105_SIZE_QLEVEL_AREA);
        if (rc < 0)
                return rc;
 

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index fd567ee6a23f2bd6ea0698e08d281f6ed70f520c..e95039727c1c817353755f8a06e84790ea06553b 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -2123,8 +2123,8 @@ static int sja1105_check_device_id(struct sja1105_private *priv)
                return -ENODEV;
        }
 
-       rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs->prod_id,
-                                        prod_id, SJA1105_SIZE_DEVICE_ID);
+       rc = sja1105_xfer_buf(priv, SPI_READ, regs->prod_id, prod_id,
+                             SJA1105_SIZE_DEVICE_ID);
        if (rc < 0)
                return rc;
 

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c
index 42cc698fcc908f777c77624c451af2d511868466..0df1bbec475aa20829163ad4a742d62d8b38525d 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_ptp.c
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.c
@@ -91,8 +91,8 @@ int sja1105et_ptp_cmd(const void *ctx, const void *data)
        sja1105_pack(buf, &valid,           31, 31, size);
        sja1105_pack(buf, &cmd->resptp,      2,  2, size);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs->ptp_control,
-                                          buf, SJA1105_SIZE_PTP_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->ptp_control, buf,
+                               SJA1105_SIZE_PTP_CMD);
 }
 
 int sja1105pqrs_ptp_cmd(const void *ctx, const void *data)
@@ -108,8 +108,8 @@ int sja1105pqrs_ptp_cmd(const void *ctx, const void *data)
        sja1105_pack(buf, &valid,           31, 31, size);
        sja1105_pack(buf, &cmd->resptp,      3,  3, size);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs->ptp_control,
-                                          buf, SJA1105_SIZE_PTP_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->ptp_control, buf,
+                               SJA1105_SIZE_PTP_CMD);
 }
 
 /* The switch returns partial timestamps (24 bits for SJA1105 E/T, which wrap
@@ -180,10 +180,8 @@ int sja1105_ptpegr_ts_poll(struct sja1105_private *priv, int port, u64 *ts)
        int rc;
 
        do {
-               rc = sja1105_spi_send_packed_buf(priv, SPI_READ,
-                                                regs->ptpegr_ts[port],
-                                                packed_buf,
-                                                priv->info->ptpegr_ts_bytes);
+               rc = sja1105_xfer_buf(priv, SPI_READ, regs->ptpegr_ts[port],
+                                     packed_buf, priv->info->ptpegr_ts_bytes);
                if (rc < 0)
                        return rc;
 

diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c
index 77a8c0fbc0eb0ea55448d1e2ed0a447d36a810f6..6dda2e328fe2c6387a8d2c7c2049b8f03c6d9034 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_spi.c
+++ b/drivers/net/dsa/sja1105/sja1105_spi.c
@@ -63,11 +63,11 @@ sja1105_spi_message_pack(void *buf, const struct sja1105_spi_message *msg)
  *
  * This function should only be called if it is priorly known that
  * @size_bytes is smaller than SIZE_SPI_MSG_MAXLEN. Larger packed buffers
- * are chunked in smaller pieces by sja1105_spi_send_long_packed_buf below.
+ * are chunked in smaller pieces by sja1105_xfer_long_buf below.
  */
-int sja1105_spi_send_packed_buf(const struct sja1105_private *priv,
-                               sja1105_spi_rw_mode_t rw, u64 reg_addr,
-                               void *packed_buf, size_t size_bytes)
+int sja1105_xfer_buf(const struct sja1105_private *priv,
+                    sja1105_spi_rw_mode_t rw, u64 reg_addr,
+                    void *packed_buf, size_t size_bytes)
 {
        u8 tx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};
        u8 rx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};
@@ -118,7 +118,7 @@ int sja1105_xfer_u64(const struct sja1105_private *priv,
        if (rw == SPI_WRITE)
                sja1105_pack(packed_buf, value, 63, 0, 8);
 
-       rc = sja1105_spi_send_packed_buf(priv, rw, reg_addr, packed_buf, 8);
+       rc = sja1105_xfer_buf(priv, rw, reg_addr, packed_buf, 8);
 
        if (rw == SPI_READ)
                sja1105_unpack(packed_buf, value, 63, 0, 8);
@@ -142,7 +142,7 @@ int sja1105_xfer_u32(const struct sja1105_private *priv,
                sja1105_pack(packed_buf, &tmp, 31, 0, 4);
        }
 
-       rc = sja1105_spi_send_packed_buf(priv, rw, reg_addr, packed_buf, 4);
+       rc = sja1105_xfer_buf(priv, rw, reg_addr, packed_buf, 4);
 
        if (rw == SPI_READ) {
                sja1105_unpack(packed_buf, &tmp, 31, 0, 4);
@@ -156,9 +156,9 @@ int sja1105_xfer_u32(const struct sja1105_private *priv,
  * must be sent/received. Splitting the buffer into chunks and assembling
  * those into SPI messages is done automatically by this function.
  */
-int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,
-                                    sja1105_spi_rw_mode_t rw, u64 base_addr,
-                                    void *packed_buf, u64 buf_len)
+int sja1105_xfer_long_buf(const struct sja1105_private *priv,
+                         sja1105_spi_rw_mode_t rw, u64 base_addr,
+                         void *packed_buf, u64 buf_len)
 {
        struct chunk {
                void *buf_ptr;
@@ -174,8 +174,8 @@ int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,
        chunk.len = min_t(int, buf_len, SJA1105_SIZE_SPI_MSG_MAXLEN);
 
        while (chunk.len) {
-               rc = sja1105_spi_send_packed_buf(priv, rw, chunk.spi_address,
-                                                chunk.buf_ptr, chunk.len);
+               rc = sja1105_xfer_buf(priv, rw, chunk.spi_address,
+                                     chunk.buf_ptr, chunk.len);
                if (rc < 0)
                        return rc;
 
@@ -257,8 +257,8 @@ static int sja1105et_reset_cmd(const void *ctx, const void *data)
 
        sja1105et_reset_cmd_pack(packed_buf, reset);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs->rgu,
-                                          packed_buf, SJA1105_SIZE_RESET_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->rgu, packed_buf,
+                               SJA1105_SIZE_RESET_CMD);
 }
 
 static int sja1105pqrs_reset_cmd(const void *ctx, const void *data)
@@ -287,8 +287,8 @@ static int sja1105pqrs_reset_cmd(const void *ctx, const void *data)
 
        sja1105pqrs_reset_cmd_pack(packed_buf, reset);
 
-       return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs->rgu,
-                                          packed_buf, SJA1105_SIZE_RESET_CMD);
+       return sja1105_xfer_buf(priv, SPI_WRITE, regs->rgu, packed_buf,
+                               SJA1105_SIZE_RESET_CMD);
 }
 
 static int sja1105_cold_reset(const struct sja1105_private *priv)
@@ -355,9 +355,7 @@ static int sja1105_status_get(struct sja1105_private *priv,
        u8 packed_buf[4];
        int rc;
 
-       rc = sja1105_spi_send_packed_buf(priv, SPI_READ,
-                                        regs->status,
-                                        packed_buf, 4);
+       rc = sja1105_xfer_buf(priv, SPI_READ, regs->status, packed_buf, 4);
        if (rc < 0)
                return rc;
 
@@ -451,9 +449,8 @@ int sja1105_static_config_upload(struct sja1105_private *priv)
                /* Wait for the switch to come out of reset */
                usleep_range(1000, 5000);
                /* Upload the static config to the device */
-               rc = sja1105_spi_send_long_packed_buf(priv, SPI_WRITE,
-                                                     regs->config,
-                                                     config_buf, buf_len);
+               rc = sja1105_xfer_long_buf(priv, SPI_WRITE, regs->config,
+                                          config_buf, buf_len);
                if (rc < 0) {
                        dev_err(dev, "Failed to upload config, retrying...\n");
                        continue;