Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Peter Ujfalusi and committed by
Santosh Shilimkar
fed7552f bb49ca00

-79
-72
drivers/firmware/ti_sci.c
··· 2049 2049 } 2050 2050 2051 2051 /** 2052 - * ti_sci_cmd_ring_config() - configure RA ring 2053 - * @handle: Pointer to TI SCI handle. 2054 - * @valid_params: Bitfield defining validity of ring configuration 2055 - * parameters 2056 - * @nav_id: Device ID of Navigator Subsystem from which the ring is 2057 - * allocated 2058 - * @index: Ring index 2059 - * @addr_lo: The ring base address lo 32 bits 2060 - * @addr_hi: The ring base address hi 32 bits 2061 - * @count: Number of ring elements 2062 - * @mode: The mode of the ring 2063 - * @size: The ring element size. 2064 - * @order_id: Specifies the ring's bus order ID 2065 - * 2066 - * Return: 0 if all went well, else returns appropriate error value. 2067 - * 2068 - * See @ti_sci_msg_rm_ring_cfg_req for more info. 2069 - */ 2070 - static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle, 2071 - u32 valid_params, u16 nav_id, u16 index, 2072 - u32 addr_lo, u32 addr_hi, u32 count, 2073 - u8 mode, u8 size, u8 order_id) 2074 - { 2075 - struct ti_sci_msg_rm_ring_cfg_req *req; 2076 - struct ti_sci_msg_hdr *resp; 2077 - struct ti_sci_xfer *xfer; 2078 - struct ti_sci_info *info; 2079 - struct device *dev; 2080 - int ret = 0; 2081 - 2082 - if (IS_ERR_OR_NULL(handle)) 2083 - return -EINVAL; 2084 - 2085 - info = handle_to_ti_sci_info(handle); 2086 - dev = info->dev; 2087 - 2088 - xfer = ti_sci_get_one_xfer(info, TI_SCI_MSG_RM_RING_CFG, 2089 - TI_SCI_FLAG_REQ_ACK_ON_PROCESSED, 2090 - sizeof(*req), sizeof(*resp)); 2091 - if (IS_ERR(xfer)) { 2092 - ret = PTR_ERR(xfer); 2093 - dev_err(dev, "RM_RA:Message config failed(%d)\n", ret); 2094 - return ret; 2095 - } 2096 - req = (struct ti_sci_msg_rm_ring_cfg_req *)xfer->xfer_buf; 2097 - req->valid_params = valid_params; 2098 - req->nav_id = nav_id; 2099 - req->index = index; 2100 - req->addr_lo = addr_lo; 2101 - req->addr_hi = addr_hi; 2102 - req->count = count; 2103 - req->mode = mode; 2104 - req->size = size; 2105 - req->order_id = order_id; 2106 - 2107 - ret = ti_sci_do_xfer(info, xfer); 2108 - if (ret) { 2109 - dev_err(dev, "RM_RA:Mbox config send fail %d\n", ret); 2110 - goto fail; 2111 - } 2112 - 2113 - resp = (struct ti_sci_msg_hdr *)xfer->xfer_buf; 2114 - ret = ti_sci_is_response_ack(resp) ? 0 : -ENODEV; 2115 - 2116 - fail: 2117 - ti_sci_put_one_xfer(&info->minfo, xfer); 2118 - dev_dbg(dev, "RM_RA:config ring %u ret:%d\n", index, ret); 2119 - return ret; 2120 - } 2121 - 2122 - /** 2123 2052 * ti_sci_cmd_rm_ring_cfg() - Configure a NAVSS ring 2124 2053 * @handle: Pointer to TI SCI handle. 2125 2054 * @params: Pointer to ti_sci_msg_rm_ring_cfg ring config structure ··· 2837 2908 iops->free_irq = ti_sci_cmd_free_irq; 2838 2909 iops->free_event_map = ti_sci_cmd_free_event_map; 2839 2910 2840 - rops->config = ti_sci_cmd_ring_config; 2841 2911 rops->set_cfg = ti_sci_cmd_rm_ring_cfg; 2842 2912 2843 2913 psilops->pair = ti_sci_cmd_rm_psil_pair;
-7
include/linux/soc/ti/ti_sci_protocol.h
··· 310 310 311 311 /** 312 312 * struct ti_sci_rm_ringacc_ops - Ring Accelerator Management operations 313 - * @config: configure the SoC Navigator Subsystem Ring Accelerator ring 314 - * Deprecated 315 313 * @set_cfg: configure the SoC Navigator Subsystem Ring Accelerator ring 316 314 */ 317 315 struct ti_sci_rm_ringacc_ops { 318 - int (*config)(const struct ti_sci_handle *handle, 319 - u32 valid_params, u16 nav_id, u16 index, 320 - u32 addr_lo, u32 addr_hi, u32 count, u8 mode, 321 - u8 size, u8 order_id 322 - ); 323 316 int (*set_cfg)(const struct ti_sci_handle *handle, 324 317 const struct ti_sci_msg_rm_ring_cfg *params); 325 318 };