evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] s5p-mfc: Remove duplicate function s5p_mfc_reload_firmware

Browse source 
The function s5p_mfc_reload_firmware is exactly same as
s5p_mfc_load_firmware. So removing the duplicate function.

Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Arun Kumar K 2014-05-21 06:29:29 -03:00 • committed by Mauro Carvalho Chehab
parent e35ce2e4b2
commit 46075006d9
2 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/platform/s5p-mfc/s5p_mfc.c
View file

@ -162,7 +162,7 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work)
/* Double check if there is at least one instance running. /* Double check if there is at least one instance running.
* If no instance is in memory than no firmware should be present */ * If no instance is in memory than no firmware should be present */
if (dev->num_inst > 0) { if (dev->num_inst > 0) {
ret = s5p_mfc_reload_firmware(dev); ret = s5p_mfc_load_firmware(dev);
if (ret) { if (ret) {
mfc_err("Failed to reload FW\n"); mfc_err("Failed to reload FW\n");
goto unlock; goto unlock;

33
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
View file

@ -106,39 +106,6 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev)
return 0; return 0;
} }
/* Reload firmware to MFC */
int s5p_mfc_reload_firmware(struct s5p_mfc_dev *dev)
{
struct firmware *fw_blob;
int err;
/* Firmare has to be present as a separate file or compiled
* into kernel. */
mfc_debug_enter();
err = request_firmware((const struct firmware **)&fw_blob,
dev->variant->fw_name, dev->v4l2_dev.dev);
if (err != 0) {
mfc_err("Firmware is not present in the /lib/firmware directory nor compiled in kernel\n");
return -EINVAL;
}
if (fw_blob->size > dev->fw_size) {
mfc_err("MFC firmware is too big to be loaded\n");
release_firmware(fw_blob);
return -ENOMEM;
}
if (!dev->fw_virt_addr) {
mfc_err("MFC firmware is not allocated\n");
release_firmware(fw_blob);
return -EINVAL;
}
memcpy(dev->fw_virt_addr, fw_blob->data, fw_blob->size);
wmb();
release_firmware(fw_blob);
mfc_debug_leave();
return 0;
}
/* Release firmware memory */ /* Release firmware memory */
int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev) int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev)
{ {