Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46075006 authored by Arun Kumar K's avatar Arun Kumar K Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Remove duplicate function s5p_mfc_reload_firmware 



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

Signed-off-by: default avatarArun Kumar K <arun.kk@samsung.com>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent e35ce2e4

drivers/media/platform/s5p-mfc/s5p_mfc.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work) 
	/* Double check if there is at least one instance running.

	 * If no instance is in memory than no firmware should be present */

	if (dev->num_inst > 0) {

		ret = s5p_mfc_reload_firmware(dev);

		ret = s5p_mfc_load_firmware(dev);

		if (ret) {

			mfc_err("Failed to reload FW\n");

			goto unlock;

drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c

+0 −33
Original line number Diff line number Diff line
@@ -106,39 +106,6 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) 
	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 */

int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev)

{