| Message ID | 20190615123823.15708-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 4c960505df44b94001178575a505dd8315086edc |
| Headers | show |
| Series | [v2,-next] firmware: ti_sci: remove set but not used variable 'dev' | expand |
Sorry, Pls ignore this, will fix the patch title On 2019/6/15 20:38, YueHaibing wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/firmware/ti_sci.c: In function ti_sci_cmd_ring_config: > drivers/firmware/ti_sci.c:2035:17: warning: variable dev set but not used [-Wunused-but-set-variable] > drivers/firmware/ti_sci.c: In function ti_sci_cmd_ring_get_config: > drivers/firmware/ti_sci.c:2104:17: warning: variable dev set but not used [-Wunused-but-set-variable] > drivers/firmware/ti_sci.c: In function ti_sci_cmd_rm_udmap_tx_ch_cfg: > drivers/firmware/ti_sci.c:2287:17: warning: variable dev set but not used [-Wunused-but-set-variable] > drivers/firmware/ti_sci.c: In function ti_sci_cmd_rm_udmap_rx_ch_cfg: > drivers/firmware/ti_sci.c:2357:17: warning: variable dev set but not used [-Wunused-but-set-variable] > > Use the 'dev' variable instead of 'info->dev' to fix this. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > v2: use the 'dev' variable as Suman Anna's suggestion > --- > drivers/firmware/ti_sci.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c > index 86b2727..c8da6e2 100644 > --- a/drivers/firmware/ti_sci.c > +++ b/drivers/firmware/ti_sci.c > @@ -2046,7 +2046,7 @@ static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle, > sizeof(*req), sizeof(*resp)); > if (IS_ERR(xfer)) { > ret = PTR_ERR(xfer); > - dev_err(info->dev, "RM_RA:Message config failed(%d)\n", ret); > + 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; > @@ -2062,7 +2062,7 @@ static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle, > > ret = ti_sci_do_xfer(info, xfer); > if (ret) { > - dev_err(info->dev, "RM_RA:Mbox config send fail %d\n", ret); > + dev_err(dev, "RM_RA:Mbox config send fail %d\n", ret); > goto fail; > } > > @@ -2071,7 +2071,7 @@ static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle, > > fail: > ti_sci_put_one_xfer(&info->minfo, xfer); > - dev_dbg(info->dev, "RM_RA:config ring %u ret:%d\n", index, ret); > + dev_dbg(dev, "RM_RA:config ring %u ret:%d\n", index, ret); > return ret; > } > > @@ -2115,7 +2115,7 @@ static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle, > sizeof(*req), sizeof(*resp)); > if (IS_ERR(xfer)) { > ret = PTR_ERR(xfer); > - dev_err(info->dev, > + dev_err(dev, > "RM_RA:Message get config failed(%d)\n", ret); > return ret; > } > @@ -2125,7 +2125,7 @@ static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle, > > ret = ti_sci_do_xfer(info, xfer); > if (ret) { > - dev_err(info->dev, "RM_RA:Mbox get config send fail %d\n", ret); > + dev_err(dev, "RM_RA:Mbox get config send fail %d\n", ret); > goto fail; > } > > @@ -2150,7 +2150,7 @@ static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle, > > fail: > ti_sci_put_one_xfer(&info->minfo, xfer); > - dev_dbg(info->dev, "RM_RA:get config ring %u ret:%d\n", index, ret); > + dev_dbg(dev, "RM_RA:get config ring %u ret:%d\n", index, ret); > return ret; > } > > @@ -2298,7 +2298,7 @@ static int ti_sci_cmd_rm_udmap_tx_ch_cfg(const struct ti_sci_handle *handle, > sizeof(*req), sizeof(*resp)); > if (IS_ERR(xfer)) { > ret = PTR_ERR(xfer); > - dev_err(info->dev, "Message TX_CH_CFG alloc failed(%d)\n", ret); > + dev_err(dev, "Message TX_CH_CFG alloc failed(%d)\n", ret); > return ret; > } > req = (struct ti_sci_msg_rm_udmap_tx_ch_cfg_req *)xfer->xfer_buf; > @@ -2323,7 +2323,7 @@ static int ti_sci_cmd_rm_udmap_tx_ch_cfg(const struct ti_sci_handle *handle, > > ret = ti_sci_do_xfer(info, xfer); > if (ret) { > - dev_err(info->dev, "Mbox send TX_CH_CFG fail %d\n", ret); > + dev_err(dev, "Mbox send TX_CH_CFG fail %d\n", ret); > goto fail; > } > > @@ -2332,7 +2332,7 @@ static int ti_sci_cmd_rm_udmap_tx_ch_cfg(const struct ti_sci_handle *handle, > > fail: > ti_sci_put_one_xfer(&info->minfo, xfer); > - dev_dbg(info->dev, "TX_CH_CFG: chn %u ret:%u\n", params->index, ret); > + dev_dbg(dev, "TX_CH_CFG: chn %u ret:%u\n", params->index, ret); > return ret; > } > > @@ -2368,7 +2368,7 @@ static int ti_sci_cmd_rm_udmap_rx_ch_cfg(const struct ti_sci_handle *handle, > sizeof(*req), sizeof(*resp)); > if (IS_ERR(xfer)) { > ret = PTR_ERR(xfer); > - dev_err(info->dev, "Message RX_CH_CFG alloc failed(%d)\n", ret); > + dev_err(dev, "Message RX_CH_CFG alloc failed(%d)\n", ret); > return ret; > } > req = (struct ti_sci_msg_rm_udmap_rx_ch_cfg_req *)xfer->xfer_buf; > @@ -2392,7 +2392,7 @@ static int ti_sci_cmd_rm_udmap_rx_ch_cfg(const struct ti_sci_handle *handle, > > ret = ti_sci_do_xfer(info, xfer); > if (ret) { > - dev_err(info->dev, "Mbox send RX_CH_CFG fail %d\n", ret); > + dev_err(dev, "Mbox send RX_CH_CFG fail %d\n", ret); > goto fail; > } > > @@ -2401,7 +2401,7 @@ static int ti_sci_cmd_rm_udmap_rx_ch_cfg(const struct ti_sci_handle *handle, > > fail: > ti_sci_put_one_xfer(&info->minfo, xfer); > - dev_dbg(info->dev, "RX_CH_CFG: chn %u ret:%d\n", params->index, ret); > + dev_dbg(dev, "RX_CH_CFG: chn %u ret:%d\n", params->index, ret); > return ret; > } > >
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 86b2727..c8da6e2 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -2046,7 +2046,7 @@ static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle, sizeof(*req), sizeof(*resp)); if (IS_ERR(xfer)) { ret = PTR_ERR(xfer); - dev_err(info->dev, "RM_RA:Message config failed(%d)\n", ret); + 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; @@ -2062,7 +2062,7 @@ static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle, ret = ti_sci_do_xfer(info, xfer); if (ret) { - dev_err(info->dev, "RM_RA:Mbox config send fail %d\n", ret); + dev_err(dev, "RM_RA:Mbox config send fail %d\n", ret); goto fail; } @@ -2071,7 +2071,7 @@ static int ti_sci_cmd_ring_config(const struct ti_sci_handle *handle, fail: ti_sci_put_one_xfer(&info->minfo, xfer); - dev_dbg(info->dev, "RM_RA:config ring %u ret:%d\n", index, ret); + dev_dbg(dev, "RM_RA:config ring %u ret:%d\n", index, ret); return ret; } @@ -2115,7 +2115,7 @@ static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle, sizeof(*req), sizeof(*resp)); if (IS_ERR(xfer)) { ret = PTR_ERR(xfer); - dev_err(info->dev, + dev_err(dev, "RM_RA:Message get config failed(%d)\n", ret); return ret; } @@ -2125,7 +2125,7 @@ static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle, ret = ti_sci_do_xfer(info, xfer); if (ret) { - dev_err(info->dev, "RM_RA:Mbox get config send fail %d\n", ret); + dev_err(dev, "RM_RA:Mbox get config send fail %d\n", ret); goto fail; } @@ -2150,7 +2150,7 @@ static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle, fail: ti_sci_put_one_xfer(&info->minfo, xfer); - dev_dbg(info->dev, "RM_RA:get config ring %u ret:%d\n", index, ret); + dev_dbg(dev, "RM_RA:get config ring %u ret:%d\n", index, ret); return ret; } @@ -2298,7 +2298,7 @@ static int ti_sci_cmd_rm_udmap_tx_ch_cfg(const struct ti_sci_handle *handle, sizeof(*req), sizeof(*resp)); if (IS_ERR(xfer)) { ret = PTR_ERR(xfer); - dev_err(info->dev, "Message TX_CH_CFG alloc failed(%d)\n", ret); + dev_err(dev, "Message TX_CH_CFG alloc failed(%d)\n", ret); return ret; } req = (struct ti_sci_msg_rm_udmap_tx_ch_cfg_req *)xfer->xfer_buf; @@ -2323,7 +2323,7 @@ static int ti_sci_cmd_rm_udmap_tx_ch_cfg(const struct ti_sci_handle *handle, ret = ti_sci_do_xfer(info, xfer); if (ret) { - dev_err(info->dev, "Mbox send TX_CH_CFG fail %d\n", ret); + dev_err(dev, "Mbox send TX_CH_CFG fail %d\n", ret); goto fail; } @@ -2332,7 +2332,7 @@ static int ti_sci_cmd_rm_udmap_tx_ch_cfg(const struct ti_sci_handle *handle, fail: ti_sci_put_one_xfer(&info->minfo, xfer); - dev_dbg(info->dev, "TX_CH_CFG: chn %u ret:%u\n", params->index, ret); + dev_dbg(dev, "TX_CH_CFG: chn %u ret:%u\n", params->index, ret); return ret; } @@ -2368,7 +2368,7 @@ static int ti_sci_cmd_rm_udmap_rx_ch_cfg(const struct ti_sci_handle *handle, sizeof(*req), sizeof(*resp)); if (IS_ERR(xfer)) { ret = PTR_ERR(xfer); - dev_err(info->dev, "Message RX_CH_CFG alloc failed(%d)\n", ret); + dev_err(dev, "Message RX_CH_CFG alloc failed(%d)\n", ret); return ret; } req = (struct ti_sci_msg_rm_udmap_rx_ch_cfg_req *)xfer->xfer_buf; @@ -2392,7 +2392,7 @@ static int ti_sci_cmd_rm_udmap_rx_ch_cfg(const struct ti_sci_handle *handle, ret = ti_sci_do_xfer(info, xfer); if (ret) { - dev_err(info->dev, "Mbox send RX_CH_CFG fail %d\n", ret); + dev_err(dev, "Mbox send RX_CH_CFG fail %d\n", ret); goto fail; } @@ -2401,7 +2401,7 @@ static int ti_sci_cmd_rm_udmap_rx_ch_cfg(const struct ti_sci_handle *handle, fail: ti_sci_put_one_xfer(&info->minfo, xfer); - dev_dbg(info->dev, "RX_CH_CFG: chn %u ret:%d\n", params->index, ret); + dev_dbg(dev, "RX_CH_CFG: chn %u ret:%d\n", params->index, ret); return ret; }
Fixes gcc '-Wunused-but-set-variable' warning: drivers/firmware/ti_sci.c: In function ti_sci_cmd_ring_config: drivers/firmware/ti_sci.c:2035:17: warning: variable dev set but not used [-Wunused-but-set-variable] drivers/firmware/ti_sci.c: In function ti_sci_cmd_ring_get_config: drivers/firmware/ti_sci.c:2104:17: warning: variable dev set but not used [-Wunused-but-set-variable] drivers/firmware/ti_sci.c: In function ti_sci_cmd_rm_udmap_tx_ch_cfg: drivers/firmware/ti_sci.c:2287:17: warning: variable dev set but not used [-Wunused-but-set-variable] drivers/firmware/ti_sci.c: In function ti_sci_cmd_rm_udmap_rx_ch_cfg: drivers/firmware/ti_sci.c:2357:17: warning: variable dev set but not used [-Wunused-but-set-variable] Use the 'dev' variable instead of 'info->dev' to fix this. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- v2: use the 'dev' variable as Suman Anna's suggestion --- drivers/firmware/ti_sci.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)