Commit 3f823e09 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] exynos4-is: Simplify fimc-is hardware polling helpers 



The fimc_is_hw_wait_intsr0_intsd0() function is currently unused and
can be safely removed. The other polling function simplified and ETIME
error code is replaced with more commonly used ETIMEDOUT.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b1fbe051

drivers/media/platform/exynos4-is/fimc-is-regs.c

+6 −30
Original line number Diff line number Diff line
@@ -33,47 +33,23 @@ void fimc_is_hw_set_intgr0_gd0(struct fimc_is *is) 
	mcuctl_write(INTGR0_INTGD(0), is, MCUCTL_REG_INTGR0);

}



int fimc_is_hw_wait_intsr0_intsd0(struct fimc_is *is)

{

	unsigned int timeout = 2000;

	u32 cfg, status;



	cfg = mcuctl_read(is, MCUCTL_REG_INTSR0);

	status = INTSR0_GET_INTSD(0, cfg);



	while (status) {

		cfg = mcuctl_read(is, MCUCTL_REG_INTSR0);

		status = INTSR0_GET_INTSD(0, cfg);

		if (timeout == 0) {

			dev_warn(&is->pdev->dev, "%s timeout\n",

				 __func__);

			return -ETIME;

		}

		timeout--;

		udelay(1);

	}

	return 0;

}



int fimc_is_hw_wait_intmsr0_intmsd0(struct fimc_is *is)

{

	unsigned int timeout = 2000;

	u32 cfg, status;



	do {

		cfg = mcuctl_read(is, MCUCTL_REG_INTMSR0);

		status = INTMSR0_GET_INTMSD(0, cfg);



	while (status) {

		cfg = mcuctl_read(is, MCUCTL_REG_INTMSR0);

		status = INTMSR0_GET_INTMSD(0, cfg);

		if (timeout == 0) {

		if (--timeout == 0) {

			dev_warn(&is->pdev->dev, "%s timeout\n",

				 __func__);

			return -ETIME;

			return -ETIMEDOUT;

		}

		timeout--;

		udelay(1);

	}

	} while (status != 0);



	return 0;

}

drivers/media/platform/exynos4-is/fimc-is-regs.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ void fimc_is_fw_clear_irq2(struct fimc_is *is); 
int fimc_is_hw_get_params(struct fimc_is *is, unsigned int num);



void fimc_is_hw_set_intgr0_gd0(struct fimc_is *is);

int fimc_is_hw_wait_intsr0_intsd0(struct fimc_is *is);

int fimc_is_hw_wait_intmsr0_intmsd0(struct fimc_is *is);

void fimc_is_hw_set_sensor_num(struct fimc_is *is);

void fimc_is_hw_stream_on(struct fimc_is *is);