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

Commit 4eaa94d1 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Drop devm_free_irq when driver detach" into msm-4.8

parents 25ab5f50 2a637601

drivers/iommu/arm-smmu.c

+0 −4
Original line number Diff line number Diff line
@@ -3754,7 +3754,6 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) 


static int arm_smmu_device_remove(struct platform_device *pdev)

{

	int i;

	struct device *dev = &pdev->dev;

	struct arm_smmu_device *curr, *smmu = NULL;

	struct rb_node *node;
@@ -3784,9 +3783,6 @@ static int arm_smmu_device_remove(struct platform_device *pdev) 
	if (!bitmap_empty(smmu->context_map, ARM_SMMU_MAX_CBS))

		dev_err(dev, "removing device with active domains!\n");



	for (i = 0; i < smmu->num_global_irqs; ++i)

		devm_free_irq(smmu->dev, smmu->irqs[i], smmu);



	idr_destroy(&smmu->asid_idr);



	/* Turn the thing off */