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

Commit d4c44a8e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: smd: Register SMD & SMSM IRQs with IRQF_NO_SUSPEND flag"

parents 9a522f94 8ba0b905
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int msm_smsm_probe(struct platform_device *pdev)

	ret = request_irq(irq_line,
				private_irq->irq_handler,
				IRQF_TRIGGER_RISING,
				IRQF_TRIGGER_RISING | IRQF_NO_SUSPEND,
				node->name,
				NULL);
	if (ret < 0) {
@@ -160,7 +160,6 @@ static int msm_smd_probe(struct platform_device *pdev)
	uint32_t irq_offset;
	uint32_t irq_bitmask;
	uint32_t irq_line;
	unsigned long irq_flags = IRQF_TRIGGER_RISING;
	const char *subsys_name;
	struct interrupt_config_item *private_irq;
	struct device_node *node;
@@ -247,11 +246,6 @@ static int msm_smd_probe(struct platform_device *pdev)
		SMD_DBG("%s: %s = %d\n", __func__, key, skip_pil);
	}

	key = "qcom,irq-no-suspend";
	ret = of_property_read_bool(node, key);
	if (ret)
		irq_flags |= IRQF_NO_SUSPEND;

	private_intr_config = smd_get_intr_config(edge);
	if (!private_intr_config) {
		pr_err("%s: invalid edge\n", __func__);
@@ -267,7 +261,7 @@ static int msm_smd_probe(struct platform_device *pdev)

	ret = request_irq(irq_line,
				private_irq->irq_handler,
				irq_flags,
				IRQF_TRIGGER_RISING | IRQF_NO_SUSPEND,
				node->name,
				NULL);
	if (ret < 0) {