Merge remote-tracking branch 'asoc/topic/x86' into asoc-next (370887f1) · Commits · e / devices / android_kernel_samsung_exynos9810

sound/soc/mid-x86/mfld_machine.c

+10 −22

Original line number	Original line	Diff line number	Diff line
	@@ -371,7 +371,7 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)

	/* audio interrupt base of SRAM location where		/* audio interrupt base of SRAM location where
	* interrupts are stored by System FW */		* interrupts are stored by System FW */
	mc_drv_ctx = kzalloc(sizeof(*mc_drv_ctx), GFP_ATOMIC);		mc_drv_ctx = devm_kzalloc(&pdev->dev, sizeof(*mc_drv_ctx), GFP_ATOMIC);
	if (!mc_drv_ctx) {		if (!mc_drv_ctx) {
	pr_err("allocation failed\n");		pr_err("allocation failed\n");
	return -ENOMEM;		return -ENOMEM;
	@@ -381,51 +381,39 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
	pdev, IORESOURCE_MEM, "IRQ_BASE");		pdev, IORESOURCE_MEM, "IRQ_BASE");
	if (!irq_mem) {		if (!irq_mem) {
	pr_err("no mem resource given\n");		pr_err("no mem resource given\n");
	ret_val = -ENODEV;		return -ENODEV;
	goto unalloc;
	}		}
	mc_drv_ctx->int_base = ioremap_nocache(irq_mem->start,		mc_drv_ctx->int_base = devm_ioremap_nocache(&pdev->dev, irq_mem->start,
	resource_size(irq_mem));		resource_size(irq_mem));
	if (!mc_drv_ctx->int_base) {		if (!mc_drv_ctx->int_base) {
	pr_err("Mapping of cache failed\n");		pr_err("Mapping of cache failed\n");
	ret_val = -ENOMEM;		return -ENOMEM;
	goto unalloc;
	}		}
	/* register for interrupt */		/* register for interrupt */
	ret_val = request_threaded_irq(irq, snd_mfld_jack_intr_handler,		ret_val = devm_request_threaded_irq(&pdev->dev, irq,
			snd_mfld_jack_intr_handler,
	snd_mfld_jack_detection,		snd_mfld_jack_detection,
	IRQF_SHARED, pdev->dev.driver->name, mc_drv_ctx);		IRQF_SHARED, pdev->dev.driver->name, mc_drv_ctx);
	if (ret_val) {		if (ret_val) {
	pr_err("cannot register IRQ\n");		pr_err("cannot register IRQ\n");
	goto unalloc;		return ret_val;
	}		}
	/* register the soc card */		/* register the soc card */
	snd_soc_card_mfld.dev = &pdev->dev;		snd_soc_card_mfld.dev = &pdev->dev;
	ret_val = snd_soc_register_card(&snd_soc_card_mfld);		ret_val = snd_soc_register_card(&snd_soc_card_mfld);
	if (ret_val) {		if (ret_val) {
	pr_debug("snd_soc_register_card failed %d\n", ret_val);		pr_debug("snd_soc_register_card failed %d\n", ret_val);
	goto freeirq;		return ret_val;
	}		}
	platform_set_drvdata(pdev, mc_drv_ctx);		platform_set_drvdata(pdev, mc_drv_ctx);
	pr_debug("successfully exited probe\n");		pr_debug("successfully exited probe\n");
	return ret_val;		return 0;

	freeirq:
	free_irq(irq, mc_drv_ctx);
	unalloc:
	kfree(mc_drv_ctx);
	return ret_val;
	}		}

	static int snd_mfld_mc_remove(struct platform_device *pdev)		static int snd_mfld_mc_remove(struct platform_device *pdev)
	{		{
	struct mfld_mc_private *mc_drv_ctx = platform_get_drvdata(pdev);

	pr_debug("snd_mfld_mc_remove called\n");		pr_debug("snd_mfld_mc_remove called\n");
	free_irq(platform_get_irq(pdev, 0), mc_drv_ctx);
	snd_soc_unregister_card(&snd_soc_card_mfld);		snd_soc_unregister_card(&snd_soc_card_mfld);
	kfree(mc_drv_ctx);
	platform_set_drvdata(pdev, NULL);
	return 0;		return 0;
	}		}