summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-04-28 09:23:31 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-05-20 13:32:17 +0300
commit8a85fe11c2182168e61cda53f8abded802371b6f (patch)
tree663091ded2b0f5cd8af243003d2b62f3f843efff
parentc06e212da091388fcf715bcf365e83ec20b425cb (diff)
downloadlinux-8a85fe11c2182168e61cda53f8abded802371b6f.tar.xz
media: atomisp: get rid of some non-existing functions for ISP2401
There are no ia_css_set_system_mode() nor ia_css_is_system_mode_suspend_or_resume() functions at the driver. So, get rid of the code that would try to call it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c42
1 files changed, 1 insertions, 41 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
index ee58db7758e1..aa8b270ce931 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
@@ -10648,12 +10648,6 @@ ERR:
sh_css_setup_queues();
ia_css_bufq_dump_queue_info();
-#ifdef ISP2401
- if (ia_css_is_system_mode_suspend_or_resume() == false) /* skip in suspend/resume flow */
- {
- ia_css_set_system_mode(IA_CSS_SYS_MODE_WORKING);
- }
-#endif
IA_CSS_LEAVE_ERR(err);
return err;
}
@@ -10722,18 +10716,8 @@ ERR:
sh_css_hmm_buffer_record_uninit();
-#ifndef ISP2401
/* clear pending param sets from refcount */
sh_css_param_clear_param_sets();
-#else
- if (ia_css_is_system_mode_suspend_or_resume() == false) /* skip in suspend/resume flow */
- {
- /* clear pending param sets from refcount */
- sh_css_param_clear_param_sets();
- ia_css_set_system_mode(
- IA_CSS_SYS_MODE_INIT); /* System is initialized but not 'running' */
- }
-#endif
IA_CSS_LEAVE_ERR(err);
return err;
@@ -11252,17 +11236,8 @@ ERR:
sh_css_hmm_buffer_record_init(void) {
int i;
-#ifndef ISP2401
- for (i = 0; i < MAX_HMM_BUFFER_NUM; i++) {
+ for (i = 0; i < MAX_HMM_BUFFER_NUM; i++)
sh_css_hmm_buffer_record_reset(&hmm_buffer_record[i]);
-#else
- if (ia_css_is_system_mode_suspend_or_resume() ==
- false) { /* skip in suspend/resume flow */
- for (i = 0; i < MAX_HMM_BUFFER_NUM; i++) {
- sh_css_hmm_buffer_record_reset(&hmm_buffer_record[i]);
- }
-#endif
- }
}
static void
@@ -11270,29 +11245,14 @@ ERR:
int i;
struct sh_css_hmm_buffer_record *buffer_record = NULL;
-#ifndef ISP2401
buffer_record = &hmm_buffer_record[0];
for (i = 0; i < MAX_HMM_BUFFER_NUM; i++) {
if (buffer_record->in_use) {
if (buffer_record->h_vbuf)
ia_css_rmgr_rel_vbuf(hmm_buffer_pool, &buffer_record->h_vbuf);
sh_css_hmm_buffer_record_reset(buffer_record);
-#else
- if (ia_css_is_system_mode_suspend_or_resume() ==
- false) { /* skip in suspend/resume flow */
- buffer_record = &hmm_buffer_record[0];
- for (i = 0; i < MAX_HMM_BUFFER_NUM; i++) {
- if (buffer_record->in_use) {
- if (buffer_record->h_vbuf)
- ia_css_rmgr_rel_vbuf(hmm_buffer_pool, &buffer_record->h_vbuf);
- sh_css_hmm_buffer_record_reset(buffer_record);
- }
- buffer_record++;
-#endif
}
-#ifndef ISP2401
buffer_record++;
-#endif
}
}