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

Commit 287666df authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: atomisp: remove enable_isp_irq function and add disable_isp_irq 



Enable/Disable ISP irq is switched with "enable" parameter of
enable_isp_irq(). It would be better splited to two such as
enable_isp_irq()/disable_isp_irq().

But the enable_isp_irq() is no use in atomisp_cmd.c file.
So remove the enable_isp_irq() function and add
disable_isp_irq function only.

Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31991c8c

drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c

+9 −27
Original line number Original line Diff line number Diff line
@@ -376,34 +376,16 @@ int atomisp_reset(struct atomisp_device *isp) 
}

}





/*

/*

 * interrupt enable/disable functions

 * interrupt disable functions

 */

 */

static void enable_isp_irq(enum hrt_isp_css_irq irq, bool enable)

static void disable_isp_irq(enum hrt_isp_css_irq irq)

{

{

	if (enable) {

		irq_enable_channel(IRQ0_ID, irq);

		/*sh_css_hrt_irq_enable(irq, true, false);*/

		switch (irq) { /*We only have sp interrupt right now*/

		case hrt_isp_css_irq_sp:

			/*sh_css_hrt_irq_enable_sp(true);*/

			cnd_sp_irq_enable(SP0_ID, true);

			break;

		default:

			break;

		}



	} else {

		/*sh_css_hrt_irq_disable(irq);*/

	irq_disable_channel(IRQ0_ID, irq);

	irq_disable_channel(IRQ0_ID, irq);

		switch (irq) {



		case hrt_isp_css_irq_sp:

	if (irq != hrt_isp_css_irq_sp)

			/*sh_css_hrt_irq_enable_sp(false);*/

		return;



	cnd_sp_irq_enable(SP0_ID, false);

	cnd_sp_irq_enable(SP0_ID, false);

			break;

		default:

			break;

		}

	}

}

}





/*

/*
@@ -1416,7 +1398,7 @@ static void __atomisp_css_recover(struct atomisp_device *isp, bool isp_timeout) 
	}

	}





	/* clear irq */

	/* clear irq */

	enable_isp_irq(hrt_isp_css_irq_sp, false);

	disable_isp_irq(hrt_isp_css_irq_sp);

	clear_isp_irq(hrt_isp_css_irq_sp);

	clear_isp_irq(hrt_isp_css_irq_sp);





	/* Set the SRSE to 3 before resetting */

	/* Set the SRSE to 3 before resetting */