mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-02 10:59:18 -04:00
media: atomisp: Remove unused css_pipe_id argument from atomisp_css_[start|stop]()
The css_pipe_id argument pass to atomisp_css_[start|stop]() is not used, drop it. 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:
committed by
Mauro Carvalho Chehab
parent
5ab97df864
commit
e5fab487ea
@@ -932,7 +932,6 @@ 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;
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
|
||||
@@ -954,8 +953,7 @@ void atomisp_assert_recovery_work(struct work_struct *work)
|
||||
|
||||
atomisp_clear_css_buffer_counters(&isp->asd);
|
||||
|
||||
css_pipe_id = atomisp_get_css_pipe_id(&isp->asd);
|
||||
atomisp_css_stop(&isp->asd, css_pipe_id, true);
|
||||
atomisp_css_stop(&isp->asd, true);
|
||||
|
||||
isp->asd.preview_exp_id = 1;
|
||||
isp->asd.postview_exp_id = 1;
|
||||
@@ -976,8 +974,7 @@ void atomisp_assert_recovery_work(struct work_struct *work)
|
||||
|
||||
atomisp_css_input_set_mode(&isp->asd, IA_CSS_INPUT_MODE_BUFFERED_SENSOR);
|
||||
|
||||
css_pipe_id = atomisp_get_css_pipe_id(&isp->asd);
|
||||
if (atomisp_css_start(&isp->asd, css_pipe_id, true)) {
|
||||
if (atomisp_css_start(&isp->asd, true)) {
|
||||
dev_warn(isp->dev, "start SP failed, so do not set streaming to be enable!\n");
|
||||
} else {
|
||||
spin_lock_irqsave(&isp->lock, flags);
|
||||
|
||||
@@ -78,8 +78,7 @@ int atomisp_q_dis_buffer_to_css(struct atomisp_sub_device *asd,
|
||||
|
||||
void ia_css_mmu_invalidate_cache(void);
|
||||
|
||||
int atomisp_css_start(struct atomisp_sub_device *asd,
|
||||
enum ia_css_pipe_id pipe_id, bool in_reset);
|
||||
int atomisp_css_start(struct atomisp_sub_device *asd, bool in_reset);
|
||||
|
||||
void atomisp_css_update_isp_params(struct atomisp_sub_device *asd);
|
||||
void atomisp_css_update_isp_params_on_pipe(struct atomisp_sub_device *asd,
|
||||
@@ -217,8 +216,7 @@ int atomisp_css_input_configure_port(struct atomisp_sub_device *asd,
|
||||
int atomisp_create_pipes_stream(struct atomisp_sub_device *asd);
|
||||
void atomisp_destroy_pipes_stream(struct atomisp_sub_device *asd);
|
||||
|
||||
void atomisp_css_stop(struct atomisp_sub_device *asd,
|
||||
enum ia_css_pipe_id pipe_id, bool in_reset);
|
||||
void atomisp_css_stop(struct atomisp_sub_device *asd, bool in_reset);
|
||||
|
||||
void atomisp_css_continuous_set_num_raw_frames(
|
||||
struct atomisp_sub_device *asd,
|
||||
|
||||
@@ -985,8 +985,7 @@ int atomisp_q_dis_buffer_to_css(struct atomisp_sub_device *asd,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int atomisp_css_start(struct atomisp_sub_device *asd,
|
||||
enum ia_css_pipe_id pipe_id, bool in_reset)
|
||||
int atomisp_css_start(struct atomisp_sub_device *asd, bool in_reset)
|
||||
{
|
||||
struct atomisp_device *isp = asd->isp;
|
||||
bool sp_is_started = false;
|
||||
@@ -1814,8 +1813,7 @@ int atomisp_css_input_configure_port(
|
||||
return 0;
|
||||
}
|
||||
|
||||
void atomisp_css_stop(struct atomisp_sub_device *asd,
|
||||
enum ia_css_pipe_id pipe_id, bool in_reset)
|
||||
void atomisp_css_stop(struct atomisp_sub_device *asd, bool in_reset)
|
||||
{
|
||||
unsigned long irqflags;
|
||||
unsigned int i;
|
||||
|
||||
@@ -1120,7 +1120,6 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count)
|
||||
struct atomisp_sub_device *asd = pipe->asd;
|
||||
struct atomisp_device *isp = asd->isp;
|
||||
struct pci_dev *pdev = to_pci_dev(isp->dev);
|
||||
enum ia_css_pipe_id css_pipe_id;
|
||||
unsigned long irqflags;
|
||||
int ret;
|
||||
|
||||
@@ -1135,8 +1134,6 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count)
|
||||
/* Input system HW workaround */
|
||||
atomisp_dma_burst_len_cfg(asd);
|
||||
|
||||
css_pipe_id = atomisp_get_css_pipe_id(asd);
|
||||
|
||||
/* Invalidate caches. FIXME: should flush only necessary buffers */
|
||||
wbinvd();
|
||||
|
||||
@@ -1151,7 +1148,7 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count)
|
||||
}
|
||||
asd->params.dvs_6axis = NULL;
|
||||
|
||||
ret = atomisp_css_start(asd, css_pipe_id, false);
|
||||
ret = atomisp_css_start(asd, false);
|
||||
if (ret) {
|
||||
atomisp_flush_video_pipe(pipe, VB2_BUF_STATE_QUEUED, true);
|
||||
goto out_unlock;
|
||||
@@ -1217,7 +1214,6 @@ void atomisp_stop_streaming(struct vb2_queue *vq)
|
||||
struct atomisp_sub_device *asd = pipe->asd;
|
||||
struct atomisp_device *isp = asd->isp;
|
||||
struct pci_dev *pdev = to_pci_dev(isp->dev);
|
||||
enum ia_css_pipe_id css_pipe_id;
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
|
||||
@@ -1247,8 +1243,7 @@ void atomisp_stop_streaming(struct vb2_queue *vq)
|
||||
atomisp_clear_css_buffer_counters(asd);
|
||||
atomisp_css_irq_enable(isp, IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF, false);
|
||||
|
||||
css_pipe_id = atomisp_get_css_pipe_id(asd);
|
||||
atomisp_css_stop(asd, css_pipe_id, false);
|
||||
atomisp_css_stop(asd, false);
|
||||
|
||||
atomisp_flush_video_pipe(pipe, VB2_BUF_STATE_ERROR, true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user