Message ID | 20200921082440.2591617-1-liushixin2@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [-next] media: venus: simplify the return expression of venus_sys_set_* function | expand |
On Mon 21 Sep 03:24 CDT 2020, Liu Shixin wrote: > Simplify the return expression. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Liu Shixin <liushixin2@huawei.com> > --- > drivers/media/platform/qcom/venus/hfi_venus.c | 28 +++---------------- > 1 file changed, 4 insertions(+), 24 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c > index 4be4a75ddcb6..05ddb68023b8 100644 > --- a/drivers/media/platform/qcom/venus/hfi_venus.c > +++ b/drivers/media/platform/qcom/venus/hfi_venus.c > @@ -772,34 +772,24 @@ static int venus_sys_set_debug(struct venus_hfi_device *hdev, u32 debug) > { > struct hfi_sys_set_property_pkt *pkt; > u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; > - int ret; > > pkt = (struct hfi_sys_set_property_pkt *)packet; > > pkt_sys_debug_config(pkt, HFI_DEBUG_MODE_QUEUE, debug); > > - ret = venus_iface_cmdq_write(hdev, pkt); > - if (ret) > - return ret; > - > - return 0; > + return venus_iface_cmdq_write(hdev, pkt); > } > > static int venus_sys_set_coverage(struct venus_hfi_device *hdev, u32 mode) > { > struct hfi_sys_set_property_pkt *pkt; > u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; > - int ret; > > pkt = (struct hfi_sys_set_property_pkt *)packet; > > pkt_sys_coverage_config(pkt, mode); > > - ret = venus_iface_cmdq_write(hdev, pkt); > - if (ret) > - return ret; > - > - return 0; > + return venus_iface_cmdq_write(hdev, pkt); > } > > static int venus_sys_set_idle_message(struct venus_hfi_device *hdev, > @@ -807,7 +797,6 @@ static int venus_sys_set_idle_message(struct venus_hfi_device *hdev, > { > struct hfi_sys_set_property_pkt *pkt; > u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; > - int ret; > > if (!enable) > return 0; > @@ -816,11 +805,7 @@ static int venus_sys_set_idle_message(struct venus_hfi_device *hdev, > > pkt_sys_idle_indicator(pkt, enable); > > - ret = venus_iface_cmdq_write(hdev, pkt); > - if (ret) > - return ret; > - > - return 0; > + return venus_iface_cmdq_write(hdev, pkt); > } > > static int venus_sys_set_power_control(struct venus_hfi_device *hdev, > @@ -828,17 +813,12 @@ static int venus_sys_set_power_control(struct venus_hfi_device *hdev, > { > struct hfi_sys_set_property_pkt *pkt; > u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; > - int ret; > > pkt = (struct hfi_sys_set_property_pkt *)packet; > > pkt_sys_power_control(pkt, enable); > > - ret = venus_iface_cmdq_write(hdev, pkt); > - if (ret) > - return ret; > - > - return 0; > + return venus_iface_cmdq_write(hdev, pkt); > } > > static int venus_get_queue_size(struct venus_hfi_device *hdev, > -- > 2.25.1 >
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index 4be4a75ddcb6..05ddb68023b8 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -772,34 +772,24 @@ static int venus_sys_set_debug(struct venus_hfi_device *hdev, u32 debug) { struct hfi_sys_set_property_pkt *pkt; u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; - int ret; pkt = (struct hfi_sys_set_property_pkt *)packet; pkt_sys_debug_config(pkt, HFI_DEBUG_MODE_QUEUE, debug); - ret = venus_iface_cmdq_write(hdev, pkt); - if (ret) - return ret; - - return 0; + return venus_iface_cmdq_write(hdev, pkt); } static int venus_sys_set_coverage(struct venus_hfi_device *hdev, u32 mode) { struct hfi_sys_set_property_pkt *pkt; u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; - int ret; pkt = (struct hfi_sys_set_property_pkt *)packet; pkt_sys_coverage_config(pkt, mode); - ret = venus_iface_cmdq_write(hdev, pkt); - if (ret) - return ret; - - return 0; + return venus_iface_cmdq_write(hdev, pkt); } static int venus_sys_set_idle_message(struct venus_hfi_device *hdev, @@ -807,7 +797,6 @@ static int venus_sys_set_idle_message(struct venus_hfi_device *hdev, { struct hfi_sys_set_property_pkt *pkt; u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; - int ret; if (!enable) return 0; @@ -816,11 +805,7 @@ static int venus_sys_set_idle_message(struct venus_hfi_device *hdev, pkt_sys_idle_indicator(pkt, enable); - ret = venus_iface_cmdq_write(hdev, pkt); - if (ret) - return ret; - - return 0; + return venus_iface_cmdq_write(hdev, pkt); } static int venus_sys_set_power_control(struct venus_hfi_device *hdev, @@ -828,17 +813,12 @@ static int venus_sys_set_power_control(struct venus_hfi_device *hdev, { struct hfi_sys_set_property_pkt *pkt; u8 packet[IFACEQ_VAR_SMALL_PKT_SIZE]; - int ret; pkt = (struct hfi_sys_set_property_pkt *)packet; pkt_sys_power_control(pkt, enable); - ret = venus_iface_cmdq_write(hdev, pkt); - if (ret) - return ret; - - return 0; + return venus_iface_cmdq_write(hdev, pkt); } static int venus_get_queue_size(struct venus_hfi_device *hdev,
Simplify the return expression. Signed-off-by: Liu Shixin <liushixin2@huawei.com> --- drivers/media/platform/qcom/venus/hfi_venus.c | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-)