shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: Remove no longer used atomisp_css_flush()

Browse Source 
Remove the no longer used atomisp_css_flush() function and merge
atomisp_assert_recovery_work() and __atomisp_css_recover() into
a single function.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede
2023-05-11 16:14:21 +01:00
committed by Mauro Carvalho Chehab
parent 0f072c1e24
commit b19f8ef5bd
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/media/atomisp/pci/atomisp_cmd.c
View File

@@ -935,18 +935,20 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error,
atomisp_qbuffers_to_css(asd);
}
static void __atomisp_css_recover(struct atomisp_device *isp)
void atomisp_assert_recovery_work(struct work_struct *work)
{
struct atomisp_device *isp = container_of(work, struct atomisp_device,
assert_recovery_work);
struct pci_dev *pdev = to_pci_dev(isp->dev);
enum ia_css_pipe_id css_pipe_id;
bool stream_restart = false;
unsigned long flags;
int ret;
lockdep_assert_held(&isp->mutex);
mutex_lock(&isp->mutex);
if (!atomisp_streaming_count(isp))
return;
goto out_unlock;
atomisp_css_irq_enable(isp, IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF, false);
@@ -1028,26 +1030,11 @@ static void __atomisp_css_recover(struct atomisp_device *isp)
dev_warn(isp->dev,
"can't start streaming on sensor!\n");
}
}
void atomisp_assert_recovery_work(struct work_struct *work)
{
struct atomisp_device *isp = container_of(work, struct atomisp_device,
assert_recovery_work);
mutex_lock(&isp->mutex);
__atomisp_css_recover(isp);
out_unlock:
mutex_unlock(&isp->mutex);
}
void atomisp_css_flush(struct atomisp_device *isp)
{
/* Start recover */
__atomisp_css_recover(isp);
dev_dbg(isp->dev, "atomisp css flush done\n");
}
void atomisp_setup_flash(struct atomisp_sub_device *asd)
{
struct atomisp_device *isp = asd->isp;

2
drivers/staging/media/atomisp/pci/atomisp_cmd.h
View File

@@ -282,8 +282,6 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error,
enum ia_css_pipe_id css_pipe_id,
bool q_buffers, enum atomisp_input_stream_id stream_id);
void atomisp_css_flush(struct atomisp_device *isp);
/* Events. Only one event has to be exported for now. */
void atomisp_eof_event(struct atomisp_sub_device *asd, uint8_t exp_id);