Commit b6109dd6 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: intel: cleanups for indirections/logs 



The code can be simplified a bit to have a more consistent use of
'dev' and 'bus', as well as move definitions around. This will help
make the major changes in follow-up patches easier to review.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20200531182102.27840-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 929cfee3

drivers/soundwire/intel.c

+33 −35
Original line number Diff line number Diff line
@@ -92,23 +92,12 @@ 
#define SDW_ALH_STRMZCFG_DMAT		GENMASK(7, 0)

#define SDW_ALH_STRMZCFG_CHN		GENMASK(19, 16)



#define SDW_INTEL_QUIRK_MASK_BUS_DISABLE	BIT(1)



enum intel_pdi_type {

	INTEL_PDI_IN = 0,

	INTEL_PDI_OUT = 1,

	INTEL_PDI_BD = 2,

};



struct sdw_intel {

	struct sdw_cdns cdns;

	int instance;

	struct sdw_intel_link_res *link_res;

#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs;

#endif

};



#define cdns_to_intel(_cdns) container_of(_cdns, struct sdw_intel, cdns)



/*
@@ -1083,41 +1072,47 @@ static int intel_init(struct sdw_intel *sdw) 
/*

 * probe and init

 */

static int intel_probe(struct platform_device *pdev)

static int intel_master_probe(struct platform_device *pdev)

{

	struct sdw_cdns_stream_config config;

	struct device *dev = &pdev->dev;

	struct sdw_intel *sdw;

	struct sdw_bus *bus;

	int ret;



	sdw = devm_kzalloc(&pdev->dev, sizeof(*sdw), GFP_KERNEL);

	sdw = devm_kzalloc(dev, sizeof(*sdw), GFP_KERNEL);

	if (!sdw)

		return -ENOMEM;



	bus = &sdw->cdns.bus;



	sdw->instance = pdev->id;

	sdw->link_res = dev_get_platdata(&pdev->dev);

	sdw->cdns.dev = &pdev->dev;

	sdw->link_res = dev_get_platdata(dev);

	sdw->cdns.dev = dev;

	sdw->cdns.registers = sdw->link_res->registers;

	sdw->cdns.instance = sdw->instance;

	sdw->cdns.msg_count = 0;

	sdw->cdns.bus.link_id = pdev->id;

	bus->link_id = pdev->id;



	sdw_cdns_probe(&sdw->cdns);



	/* Set property read ops */

	sdw_intel_ops.read_prop = intel_prop_read;

	sdw->cdns.bus.ops = &sdw_intel_ops;

	bus->ops = &sdw_intel_ops;



	/* set driver data, accessed by snd_soc_dai_get_drvdata() */

	platform_set_drvdata(pdev, sdw);



	ret = sdw_bus_master_add(&sdw->cdns.bus, &pdev->dev, pdev->dev.fwnode);

	ret = sdw_bus_master_add(bus, dev, dev->fwnode);

	if (ret) {

		dev_err(&pdev->dev, "sdw_bus_master_add fail: %d\n", ret);

		dev_err(dev, "sdw_bus_master_add fail: %d\n", ret);

		return ret;

	}



	if (sdw->cdns.bus.prop.hw_disabled) {

		dev_info(&pdev->dev, "SoundWire master %d is disabled, ignoring\n",

			 sdw->cdns.bus.link_id);

	if (bus->prop.hw_disabled) {

		dev_info(dev,

			 "SoundWire master %d is disabled, will be ignored\n",

			 bus->link_id);

		return 0;

	}
@@ -1139,28 +1134,28 @@ static int intel_probe(struct platform_device *pdev) 
				   sdw_cdns_irq, sdw_cdns_thread,

				   IRQF_SHARED, KBUILD_MODNAME, &sdw->cdns);

	if (ret < 0) {

		dev_err(sdw->cdns.dev, "unable to grab IRQ %d, disabling device\n",

		dev_err(dev, "unable to grab IRQ %d, disabling device\n",

			sdw->link_res->irq);

		goto err_init;

	}



	ret = sdw_cdns_enable_interrupt(&sdw->cdns, true);

	if (ret < 0) {

		dev_err(sdw->cdns.dev, "cannot enable interrupts\n");

		dev_err(dev, "cannot enable interrupts\n");

		goto err_init;

	}



	ret = sdw_cdns_exit_reset(&sdw->cdns);

	if (ret < 0) {

		dev_err(sdw->cdns.dev, "unable to exit bus reset sequence\n");

		dev_err(dev, "unable to exit bus reset sequence\n");

		goto err_interrupt;

	}



	/* Register DAIs */

	ret = intel_register_dai(sdw);

	if (ret) {

		dev_err(sdw->cdns.dev, "DAI registration failed: %d\n", ret);

		snd_soc_unregister_component(sdw->cdns.dev);

		dev_err(dev, "DAI registration failed: %d\n", ret);

		snd_soc_unregister_component(dev);

		goto err_interrupt;

	}
@@ -1172,33 +1167,36 @@ static int intel_probe(struct platform_device *pdev) 
	sdw_cdns_enable_interrupt(&sdw->cdns, false);

	free_irq(sdw->link_res->irq, sdw);

err_init:

	sdw_bus_master_delete(&sdw->cdns.bus);

	sdw_bus_master_delete(bus);

	return ret;

}



static int intel_remove(struct platform_device *pdev)

static int intel_master_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct sdw_intel *sdw;

	struct sdw_bus *bus;



	sdw = platform_get_drvdata(pdev);



	if (!sdw->cdns.bus.prop.hw_disabled) {

	bus = &sdw->cdns.bus;



	if (!bus->prop.hw_disabled) {

		intel_debugfs_exit(sdw);

		sdw_cdns_enable_interrupt(&sdw->cdns, false);

		free_irq(sdw->link_res->irq, sdw);

		snd_soc_unregister_component(sdw->cdns.dev);

		snd_soc_unregister_component(dev);

	}

	sdw_bus_master_delete(&sdw->cdns.bus);

	sdw_bus_master_delete(bus);



	return 0;

}



static struct platform_driver sdw_intel_drv = {

	.probe = intel_probe,

	.remove = intel_remove,

	.probe = intel_master_probe,

	.remove = intel_master_remove,

	.driver = {

		.name = "int-sdw",



	},

};

drivers/soundwire/intel.h

+11 −0
Original line number Diff line number Diff line
@@ -27,4 +27,15 @@ struct sdw_intel_link_res { 
	struct device *dev;

};



struct sdw_intel {

	struct sdw_cdns cdns;

	int instance;

	struct sdw_intel_link_res *link_res;

#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs;

#endif

};



#define SDW_INTEL_QUIRK_MASK_BUS_DISABLE      BIT(1)



#endif /* __SDW_INTEL_LOCAL_H */

drivers/soundwire/intel_init.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/soundwire/sdw_intel.h>

#include "cadence_master.h"

#include "intel.h"



#define SDW_LINK_TYPE		4 /* from Intel ACPI documentation */