Unverified Commit da7b34f8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/dai-drv',... 

Merge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/dai-drv', 'asoc/topic/davinci', 'asoc/topic/disconnect' and 'asoc/topic/ep93xx' into asoc-next
parents c966b3cc 392b79e2 4855f6a6 d43c17da df532185 8d6fb0bc

include/sound/hdaudio_ext.h

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct hda_dai_map { 
 * @pvt_data - private data, for asoc contains asoc codec object

 */

struct hdac_ext_device {

	struct hdac_device hdac;

	struct hdac_device hdev;

	struct hdac_ext_bus *ebus;



	/* soc-dai to nid map */
@@ -213,7 +213,7 @@ struct hdac_ext_dma_params { 
	u8 stream_tag;

};

#define to_ehdac_device(dev) (container_of((dev), \

				 struct hdac_ext_device, hdac))

				 struct hdac_ext_device, hdev))

/*

 * HD-audio codec base driver

 */

include/sound/soc.h

+1 −3
Original line number Diff line number Diff line
@@ -860,12 +860,10 @@ struct snd_soc_component { 
	struct list_head card_aux_list; /* for auxiliary bound components */

	struct list_head card_list;



	struct snd_soc_dai_driver *dai_drv;

	int num_dai;



	const struct snd_soc_component_driver *driver;



	struct list_head dai_list;

	int num_dai;



	int (*read)(struct snd_soc_component *, unsigned int, unsigned int *);

	int (*write)(struct snd_soc_component *, unsigned int, unsigned int);

sound/hda/ext/hdac_ext_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *ebus, int addr) 
	edev = kzalloc(sizeof(*edev), GFP_KERNEL);

	if (!edev)

		return -ENOMEM;

	hdev = &edev->hdac;

	hdev = &edev->hdev;

	edev->ebus = ebus;



	snprintf(name, sizeof(name), "ehdaudio%dD%d", ebus->idx, addr);

sound/soc/cirrus/ep93xx-ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) 
{

	struct ep93xx_ac97_info *info;

	struct resource *res;

	unsigned int irq;

	int irq;

	int ret;



	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
@@ -378,8 +378,8 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) 
		return PTR_ERR(info->regs);



	irq = platform_get_irq(pdev, 0);

	if (!irq)

		return -ENODEV;

	if (irq <= 0)

		return irq < 0 ? irq : -ENODEV;



	ret = devm_request_irq(&pdev->dev, irq, ep93xx_ac97_interrupt,

			       IRQF_TRIGGER_HIGH, pdev->name, info);

sound/soc/codecs/da7218.c

+2 −7
Original line number Diff line number Diff line
@@ -2455,10 +2455,8 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) 
	u32 of_val32;



	pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata) {

		dev_warn(codec->dev, "Failed to allocate memory for pdata\n");

	if (!pdata)

		return NULL;

	}



	if (of_property_read_u32(np, "dlg,micbias1-lvl-millivolt", &of_val32) >= 0)

		pdata->micbias1_lvl = da7218_of_micbias_lvl(codec, of_val32);
@@ -2527,8 +2525,6 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) 
		hpldet_pdata = devm_kzalloc(codec->dev, sizeof(*hpldet_pdata),

					    GFP_KERNEL);

		if (!hpldet_pdata) {

			dev_warn(codec->dev,

				 "Failed to allocate memory for hpldet pdata\n");

			of_node_put(hpldet_np);

			return pdata;

		}
@@ -3273,8 +3269,7 @@ static int da7218_i2c_probe(struct i2c_client *i2c, 
	struct da7218_priv *da7218;

	int ret;



	da7218 = devm_kzalloc(&i2c->dev, sizeof(struct da7218_priv),

			      GFP_KERNEL);

	da7218 = devm_kzalloc(&i2c->dev, sizeof(*da7218), GFP_KERNEL);

	if (!da7218)

		return -ENOMEM;