firmware: ti_sci: rm: Remove unused config() from ti_sci_rm_ringacc_ops

The ringacc driver has been converted to use the new set_cfg function to
configure the ring, the old config ops can be removed.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index a4d2b31..235c7e7 100644 (file)
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -2049,77 +2049,6 @@ static int ti_sci_cmd_free_event_map(const struct ti_sci_handle *handle,
 }
 
 /**
- * ti_sci_cmd_ring_config() - configure RA ring
- * @handle:            Pointer to TI SCI handle.
- * @valid_params:      Bitfield defining validity of ring configuration
- *                     parameters
- * @nav_id:            Device ID of Navigator Subsystem from which the ring is
- *                     allocated
- * @index:             Ring index
- * @addr_lo:           The ring base address lo 32 bits
- * @addr_hi:           The ring base address hi 32 bits
- * @count:             Number of ring elements
- * @mode:              The mode of the ring
- * @size:              The ring element size.
- * @order_id:          Specifies the ring's bus order ID
- *
- * Return: 0 if all went well, else returns appropriate error value.
- *
- * See @ti_sci_msg_rm_ring_cfg_req for more info.
- */
-static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle,
-                                 u32 valid_params, u16 nav_id, u16 index,
-                                 u32 addr_lo, u32 addr_hi, u32 count,
-                                 u8 mode, u8 size, u8 order_id)
-{
-       struct ti_sci_msg_rm_ring_cfg_req *req;
-       struct ti_sci_msg_hdr *resp;
-       struct ti_sci_xfer *xfer;
-       struct ti_sci_info *info;
-       struct device *dev;
-       int ret = 0;
-
-       if (IS_ERR_OR_NULL(handle))
-               return -EINVAL;
-
-       info = handle_to_ti_sci_info(handle);
-       dev = info->dev;
-
-       xfer = ti_sci_get_one_xfer(info, TI_SCI_MSG_RM_RING_CFG,
-                                  TI_SCI_FLAG_REQ_ACK_ON_PROCESSED,
-                                  sizeof(*req), sizeof(*resp));
-       if (IS_ERR(xfer)) {
-               ret = PTR_ERR(xfer);
-               dev_err(dev, "RM_RA:Message config failed(%d)\n", ret);
-               return ret;
-       }
-       req = (struct ti_sci_msg_rm_ring_cfg_req *)xfer->xfer_buf;
-       req->valid_params = valid_params;
-       req->nav_id = nav_id;
-       req->index = index;
-       req->addr_lo = addr_lo;
-       req->addr_hi = addr_hi;
-       req->count = count;
-       req->mode = mode;
-       req->size = size;
-       req->order_id = order_id;
-
-       ret = ti_sci_do_xfer(info, xfer);
-       if (ret) {
-               dev_err(dev, "RM_RA:Mbox config send fail %d\n", ret);
-               goto fail;
-       }
-
-       resp = (struct ti_sci_msg_hdr *)xfer->xfer_buf;
-       ret = ti_sci_is_response_ack(resp) ? 0 : -ENODEV;
-
-fail:
-       ti_sci_put_one_xfer(&info->minfo, xfer);
-       dev_dbg(dev, "RM_RA:config ring %u ret:%d\n", index, ret);
-       return ret;
-}
-
-/**
  * ti_sci_cmd_rm_ring_cfg() - Configure a NAVSS ring
  * @handle:    Pointer to TI SCI handle.
  * @params:    Pointer to ti_sci_msg_rm_ring_cfg ring config structure
@@ -2908,7 +2837,6 @@ static void ti_sci_setup_ops(struct ti_sci_info *info)
        iops->free_irq = ti_sci_cmd_free_irq;
        iops->free_event_map = ti_sci_cmd_free_event_map;
 
-       rops->config = ti_sci_cmd_ring_config;
        rops->set_cfg = ti_sci_cmd_rm_ring_cfg;
 
        psilops->pair = ti_sci_cmd_rm_psil_pair;

diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index d171105..0aad700 100644 (file)
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -310,16 +310,9 @@ struct ti_sci_msg_rm_ring_cfg {
 
 /**
  * struct ti_sci_rm_ringacc_ops - Ring Accelerator Management operations
- * @config: configure the SoC Navigator Subsystem Ring Accelerator ring
- *         Deprecated
  * @set_cfg: configure the SoC Navigator Subsystem Ring Accelerator ring
  */
 struct ti_sci_rm_ringacc_ops {
-       int (*config)(const struct ti_sci_handle *handle,
-                     u32 valid_params, u16 nav_id, u16 index,
-                     u32 addr_lo, u32 addr_hi, u32 count, u8 mode,
-                     u8 size, u8 order_id
-       );
        int (*set_cfg)(const struct ti_sci_handle *handle,
                       const struct ti_sci_msg_rm_ring_cfg *params);
 };