diff options
| author | Kate Hsuan <hpa@redhat.com> | 2023-05-08 07:26:29 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-06-09 14:22:42 +0100 |
| commit | 5925dc0f30c2294f0015ee7060ef844b93000289 (patch) | |
| tree | b610fce6465729b0bd13da2d0e5a3e3a6e7d72e7 /drivers | |
| parent | bc13f2ffd5c0160128d7520f32767423fc044a45 (diff) | |
| download | linux-stable-5925dc0f30c2294f0015ee7060ef844b93000289.tar.gz linux-stable-5925dc0f30c2294f0015ee7060ef844b93000289.tar.bz2 linux-stable-5925dc0f30c2294f0015ee7060ef844b93000289.zip | |
media: atomisp: runtime: frame: remove #ifdef ISP2401
The actions of ISP2401 and 2400 are determined at the runtime.
Link: https://lore.kernel.org/r/20230508062632.34537-2-hpa@redhat.com
Signed-off-by: Kate Hsuan <hpa@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c index 83bb42e05421..1e374ae848e3 100644 --- a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +++ b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c @@ -601,9 +601,6 @@ static void frame_init_qplane6_planes(struct ia_css_frame *frame) static int frame_allocate_buffer_data(struct ia_css_frame *frame) { -#ifdef ISP2401 - IA_CSS_ENTER_LEAVE_PRIVATE("frame->data_bytes=%d\n", frame->data_bytes); -#endif frame->data = hmm_alloc(frame->data_bytes); if (frame->data == mmgr_NULL) return -ENOMEM; @@ -635,15 +632,11 @@ static int frame_allocate_with_data(struct ia_css_frame **frame, if (err) { kvfree(me); -#ifndef ISP2401 - return err; -#else - me = NULL; -#endif + *frame = NULL; + } else { + *frame = me; } - *frame = me; - return err; } |