| Message ID | 20230901094957.168898-4-stanislaw.gruszka@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel/ivpu: Update for -next 2023.08.25 | expand |
On 9/1/2023 3:49 AM, Stanislaw Gruszka wrote: > ivpu_pm_init() does not return any error, make it void. > > Reviewed-by: Karol Wachowski <karol.wachowski@linux.intel.com> > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> > --- > drivers/accel/ivpu/ivpu_drv.c | 4 +--- > drivers/accel/ivpu/ivpu_fw.c | 2 +- > drivers/accel/ivpu/ivpu_pm.c | 4 +--- > drivers/accel/ivpu/ivpu_pm.h | 2 +- > 4 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c > index 4b344ab614f6..b10b2909f05f 100644 > --- a/drivers/accel/ivpu/ivpu_drv.c > +++ b/drivers/accel/ivpu/ivpu_drv.c > @@ -551,9 +551,7 @@ static int ivpu_dev_init(struct ivpu_device *vdev) > if (ret) > goto err_fw_fini; > > - ret = ivpu_pm_init(vdev); > - if (ret) > - goto err_ipc_fini; > + ivpu_pm_init(vdev); > > ret = ivpu_job_done_thread_init(vdev); > if (ret) > diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c > index 9827ea4d7b83..9b6ecd3e9537 100644 > --- a/drivers/accel/ivpu/ivpu_fw.c > +++ b/drivers/accel/ivpu/ivpu_fw.c > @@ -78,7 +78,7 @@ static int ivpu_fw_request(struct ivpu_device *vdev) > } > } > > - ivpu_err(vdev, "Failed to request firmware: %d\n", ret); > + ivpu_err(vdev, "Failed to load firmware: %d\n", ret); I feel that this is unrelated to $SUBJECT. With this dropped or moved to where it fits - Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
On Fri, Sep 01, 2023 at 08:22:07AM -0600, Jeffrey Hugo wrote: > On 9/1/2023 3:49 AM, Stanislaw Gruszka wrote: > > ivpu_pm_init() does not return any error, make it void. > > > > Reviewed-by: Karol Wachowski <karol.wachowski@linux.intel.com> > > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> > > --- > > drivers/accel/ivpu/ivpu_drv.c | 4 +--- > > drivers/accel/ivpu/ivpu_fw.c | 2 +- > > drivers/accel/ivpu/ivpu_pm.c | 4 +--- > > drivers/accel/ivpu/ivpu_pm.h | 2 +- > > 4 files changed, 4 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c > > index 4b344ab614f6..b10b2909f05f 100644 > > --- a/drivers/accel/ivpu/ivpu_drv.c > > +++ b/drivers/accel/ivpu/ivpu_drv.c > > @@ -551,9 +551,7 @@ static int ivpu_dev_init(struct ivpu_device *vdev) > > if (ret) > > goto err_fw_fini; > > - ret = ivpu_pm_init(vdev); > > - if (ret) > > - goto err_ipc_fini; > > + ivpu_pm_init(vdev); > > ret = ivpu_job_done_thread_init(vdev); > > if (ret) > > diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c > > index 9827ea4d7b83..9b6ecd3e9537 100644 > > --- a/drivers/accel/ivpu/ivpu_fw.c > > +++ b/drivers/accel/ivpu/ivpu_fw.c > > @@ -78,7 +78,7 @@ static int ivpu_fw_request(struct ivpu_device *vdev) > > } > > } > > - ivpu_err(vdev, "Failed to request firmware: %d\n", ret); > > + ivpu_err(vdev, "Failed to load firmware: %d\n", ret); > > I feel that this is unrelated to $SUBJECT. With this dropped or moved to > where it fits - > Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Yes, I supposed to drop this, not sure why it's still there. Will remove before applying. Thanks Stanislaw
diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c index 4b344ab614f6..b10b2909f05f 100644 --- a/drivers/accel/ivpu/ivpu_drv.c +++ b/drivers/accel/ivpu/ivpu_drv.c @@ -551,9 +551,7 @@ static int ivpu_dev_init(struct ivpu_device *vdev) if (ret) goto err_fw_fini; - ret = ivpu_pm_init(vdev); - if (ret) - goto err_ipc_fini; + ivpu_pm_init(vdev); ret = ivpu_job_done_thread_init(vdev); if (ret) diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c index 9827ea4d7b83..9b6ecd3e9537 100644 --- a/drivers/accel/ivpu/ivpu_fw.c +++ b/drivers/accel/ivpu/ivpu_fw.c @@ -78,7 +78,7 @@ static int ivpu_fw_request(struct ivpu_device *vdev) } } - ivpu_err(vdev, "Failed to request firmware: %d\n", ret); + ivpu_err(vdev, "Failed to load firmware: %d\n", ret); return ret; } diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c index 954c9ecd3e14..28a0d1111e12 100644 --- a/drivers/accel/ivpu/ivpu_pm.c +++ b/drivers/accel/ivpu/ivpu_pm.c @@ -282,7 +282,7 @@ void ivpu_pm_reset_done_cb(struct pci_dev *pdev) pm_runtime_put_autosuspend(vdev->drm.dev); } -int ivpu_pm_init(struct ivpu_device *vdev) +void ivpu_pm_init(struct ivpu_device *vdev) { struct device *dev = vdev->drm.dev; struct ivpu_pm_info *pm = vdev->pm; @@ -303,8 +303,6 @@ int ivpu_pm_init(struct ivpu_device *vdev) pm_runtime_set_autosuspend_delay(dev, delay); ivpu_dbg(vdev, PM, "Autosuspend delay = %d\n", delay); - - return 0; } void ivpu_pm_cancel_recovery(struct ivpu_device *vdev) diff --git a/drivers/accel/ivpu/ivpu_pm.h b/drivers/accel/ivpu/ivpu_pm.h index fd4eada1290f..f41c30a14a40 100644 --- a/drivers/accel/ivpu/ivpu_pm.h +++ b/drivers/accel/ivpu/ivpu_pm.h @@ -19,7 +19,7 @@ struct ivpu_pm_info { u32 suspend_reschedule_counter; }; -int ivpu_pm_init(struct ivpu_device *vdev); +void ivpu_pm_init(struct ivpu_device *vdev); void ivpu_pm_enable(struct ivpu_device *vdev); void ivpu_pm_disable(struct ivpu_device *vdev); void ivpu_pm_cancel_recovery(struct ivpu_device *vdev);