iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: atomisp: Remove unused ia_css_frame_*() functions

Browse Source 
After the conversion to videobuf2 a bunch of ia_css_frame_*()
functions are unused, remove them.

Reviewed-by: Andy Shevchenko <andy@kernel.org>
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 2022-11-08 17:09:44 +00:00 committed by Mauro Carvalho Chehab
parent 9ff83b98a8
commit 86c9abf864
2 changed files with 0 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/staging/media/atomisp/pci/ia_css_frame_public.h
View File

@ -205,15 +205,6 @@ struct ia_css_frame {
.flash_state = IA_CSS_FRAME_FLASH_STATE_NONE, \
}
/* @brief Fill a frame with zeros
*
* @param frame The frame.
* @return None
*
* Fill a frame with pixel values of zero
*/
void ia_css_frame_zero(struct ia_css_frame *frame);
/* @brief Allocate a CSS frame structure
*
* @param frame The allocated frame.
@ -270,71 +261,6 @@ ia_css_frame_allocate_from_info(struct ia_css_frame **frame,
void
ia_css_frame_free(struct ia_css_frame *frame);
/* @brief Allocate a CSS frame structure using a frame info structure.
*
* @param frame The allocated frame.
* @param[in] info The frame info structure.
* @return The error code.
*
* Allocate an empty CSS frame with no data buffer using the parameters
* in the frame info.
*/
int
ia_css_frame_create_from_info(struct ia_css_frame **frame,
const struct ia_css_frame_info *info);
/* @brief Set a mapped data buffer to a CSS frame
*
* @param[in] frame Valid CSS frame pointer
* @param[in] mapped_data Mapped data buffer to be assigned to the CSS frame
* @param[in] data_size_bytes Size of the mapped_data in bytes
* @return The error code.
*
* Sets a mapped data buffer to this frame. This function can be called multiple
* times with different buffers or NULL to reset the data pointer. This API
* would not try free the mapped_data and its the callers responsiblity to
* free the mapped_data buffer. However if ia_css_frame_free() is called and
* the frame had a valid data buffer, it would be freed along with the frame.
*/
int
ia_css_frame_set_data(struct ia_css_frame *frame,
const ia_css_ptr mapped_data,
size_t data_size_bytes);
/* @brief Map an existing frame data pointer to a CSS frame.
*
* @param frame Pointer to the frame to be initialized
* @param[in] info The frame info.
* @param[in] data Pointer to the allocated frame data.
* @param[in] attribute Attributes to be passed to mmgr_mmap.
* @param[in] context Pointer to the a context to be passed to mmgr_mmap.
* @return The allocated frame structure.
*
* This function maps a pre-allocated pointer into a CSS frame. This can be
* used when an upper software layer is responsible for allocating the frame
* data and it wants to share that frame pointer with the CSS code.
* This function will fill the CSS frame structure just like
* ia_css_frame_allocate() does, but instead of allocating the memory, it will
* map the pre-allocated memory into the CSS address space.
*/
int
ia_css_frame_map(struct ia_css_frame **frame,
const struct ia_css_frame_info *info,
const void __user *data,
unsigned int pgnr);
/* @brief Unmap a CSS frame structure.
*
* @param[in] frame Pointer to the CSS frame.
* @return None
*
* This function unmaps the frame data pointer within a CSS frame and
* then frees the CSS frame structure. Use this for frame pointers created
* using ia_css_frame_map().
*/
void
ia_css_frame_unmap(struct ia_css_frame *frame);
static inline const struct ia_css_frame_info *
ia_css_frame_get_info(const struct ia_css_frame *frame)
{

121
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
View File

@ -88,12 +88,6 @@ ia_css_elems_bytes_from_info(
** CSS API functions, exposed by ia_css.h
**************************************************************************/
void ia_css_frame_zero(struct ia_css_frame *frame)
{
assert(frame);
hmm_set(frame->data, 0, frame->data_bytes);
}
int ia_css_frame_allocate_from_info(struct ia_css_frame **frame,
const struct ia_css_frame_info *info)
{
@ -143,121 +137,6 @@ int ia_css_frame_allocate(struct ia_css_frame **frame,
return err;
}
int ia_css_frame_map(struct ia_css_frame **frame,
const struct ia_css_frame_info *info,
const void __user *data,
unsigned int pgnr)
{
int err = 0;
struct ia_css_frame *me;
assert(frame);
/* Create the frame structure */
err = ia_css_frame_create_from_info(&me, info);
if (err)
return err;
if (pgnr < ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
dev_err(atomisp_dev,
"user space memory size is less than the expected size..\n");
err = -ENOMEM;
goto error;
} else if (pgnr > ((PAGE_ALIGN(me->data_bytes)) >> PAGE_SHIFT)) {
dev_err(atomisp_dev,
"user space memory size is large than the expected size..\n");
err = -ENOMEM;
goto error;
}
me->data = hmm_create_from_userdata(me->data_bytes, data);
if (me->data == mmgr_NULL)
err = -EINVAL;
error:
if (err) {
kvfree(me);
me = NULL;
}
*frame = me;
return err;
}
int ia_css_frame_create_from_info(struct ia_css_frame **frame,
const struct ia_css_frame_info *info)
{
int err = 0;
struct ia_css_frame *me;
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_frame_create_from_info() enter:\n");
if (!frame || !info) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_frame_create_from_info() leave: invalid arguments\n");
return -EINVAL;
}
me = frame_create(info->res.width,
info->res.height,
info->format,
info->padded_width,
info->raw_bit_depth,
false);
if (!me) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_frame_create_from_info() leave: frame create failed\n");
return -ENOMEM;
}
err = ia_css_frame_init_planes(me);
if (err) {
kvfree(me);
me = NULL;
}
*frame = me;
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_frame_create_from_info() leave:\n");
return err;
}
int ia_css_frame_set_data(struct ia_css_frame *frame,
const ia_css_ptr mapped_data,
size_t data_bytes)
{
int err = 0;
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_frame_set_data() enter:\n");
if (!frame) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_frame_set_data() leave: NULL frame\n");
return -EINVAL;
}
/* If we are setting a valid data.
* Make sure that there is enough
* room for the expected frame format
*/
if ((mapped_data != mmgr_NULL) && (frame->data_bytes > data_bytes)) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
"ia_css_frame_set_data() leave: invalid arguments\n");
return -EINVAL;
}
frame->data = mapped_data;
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_frame_set_data() leave:\n");
return err;
}
void ia_css_frame_free(struct ia_css_frame *frame)
{
IA_CSS_ENTER_PRIVATE("frame = %p", frame);