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

Commit 456fff1e authored by Lei Chen's avatar Lei Chen
Browse files

fbdev: msm: replace irq flag IRQF_DISABLED with IRQF_TRIGGER_NONE 



The IRQF_DISABLED isn't used on current kernel version, replace
irq flag IRQF_DISABLED with IRQF_TRIGGER_NONE.
Set qpic_a_clk and qpic_clk to NULL, if get the value failed from
device tree.

Change-Id: I58e08a315806dd3f589ab5b88b789b6477959eef
Signed-off-by: default avatarLei Chen <chenlei@codeaurora.org>
parent 65ca63e7

drivers/video/fbdev/msm/mdss_qpic.c

+7 −4
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ int mdss_qpic_init(void) 
	if (use_irq && (!qpic_res->irq_requested)) {

		ret = devm_request_irq(&qpic_res->pdev->dev,

			qpic_res->irq, qpic_irq_handler,

			IRQF_DISABLED,	"QPIC", qpic_res);

			IRQF_TRIGGER_NONE, "QPIC", qpic_res);

		if (ret) {

			pr_err("qpic request_irq() failed!\n");

			use_irq = false;
@@ -776,12 +776,15 @@ static int mdss_qpic_probe(struct platform_device *pdev) 
	}



	qpic_res->qpic_a_clk = clk_get(&pdev->dev, "core_a_clk");

	if (IS_ERR(qpic_res->qpic_a_clk))

	if (IS_ERR(qpic_res->qpic_a_clk)) {

		qpic_res->qpic_a_clk = NULL;

		pr_err("%s: Can't find core_a_clk", __func__);



	}

	qpic_res->qpic_clk = clk_get(&pdev->dev, "core_clk");

	if (IS_ERR(qpic_res->qpic_clk))

	if (IS_ERR(qpic_res->qpic_clk)) {

		qpic_res->qpic_clk = NULL;

		pr_err("%s: Can't find core_clk", __func__);

	}



	qpic_res->irq = res->start;

	qpic_res->res_init = true;