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

Commit a41d1224 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Embed bus into controller object 



... and replace with the existing hda-core helper codes.
This reduces lots of lines, finally.

Since struct hda_bus is now embedded into struct azx,
snd_hda_bus_new() is moved and expanded from hda_codec.c to
hda_controller.c, accordingly.  Also private_free bus ops and
private_data field are removed because we no longer need to point azx
object from bus (we can use container_of())

The spin locks are consolidated into the single one, bus->reg_lock.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ccc98865

sound/pci/hda/hda_codec.c

+0 −72
Original line number Diff line number Diff line
@@ -481,78 +481,6 @@ int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid, 
	return devices;

}



/*

 * destructor

 */

static void snd_hda_bus_free(struct hda_bus *bus)

{

	if (!bus)

		return;

	if (bus->ops.private_free)

		bus->ops.private_free(bus);

	snd_hdac_bus_exit(&bus->core);

	kfree(bus);

}



static int snd_hda_bus_dev_free(struct snd_device *device)

{

	snd_hda_bus_free(device->device_data);

	return 0;

}



static int snd_hda_bus_dev_disconnect(struct snd_device *device)

{

	struct hda_bus *bus = device->device_data;

	bus->shutdown = 1;

	return 0;

}



/**

 * snd_hda_bus_new - create a HDA bus

 * @card: the card entry

 * @busp: the pointer to store the created bus instance

 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hda_bus_new(struct snd_card *card,

		    const struct hdac_bus_ops *ops,

		    const struct hdac_io_ops *io_ops,

		    struct hda_bus **busp)

{

	struct hda_bus *bus;

	int err;

	static struct snd_device_ops dev_ops = {

		.dev_disconnect = snd_hda_bus_dev_disconnect,

		.dev_free = snd_hda_bus_dev_free,

	};



	if (busp)

		*busp = NULL;



	bus = kzalloc(sizeof(*bus), GFP_KERNEL);

	if (!bus)

		return -ENOMEM;



	err = snd_hdac_bus_init(&bus->core, card->dev, ops, io_ops);

	if (err < 0) {

		kfree(bus);

		return err;

	}



	bus->card = card;

	mutex_init(&bus->prepare_mutex);



	err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops);

	if (err < 0) {

		snd_hda_bus_free(bus);

		return err;

	}

	if (busp)

		*busp = bus;

	return 0;

}

EXPORT_SYMBOL_GPL(snd_hda_bus_new);



/*

 * read widget caps for each widget and store in cache

 */

sound/pci/hda/hda_codec.h

+0 −3
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ struct hda_pcm_stream; 


/* bus operators */

struct hda_bus_ops {

	/* free the private data */

	void (*private_free)(struct hda_bus *);

	/* attach a PCM stream */

	int (*attach_pcm)(struct hda_bus *bus, struct hda_codec *codec,

			  struct hda_pcm *pcm);
@@ -73,7 +71,6 @@ struct hda_bus { 


	struct snd_card *card;



	void *private_data;

	struct pci_dev *pci;

	const char *modelname;

	struct hda_bus_ops ops;

sound/pci/hda/hda_controller.c

+107 −454

File changed.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/hda_controller.h

+20 −45
Original line number Diff line number Diff line
@@ -75,18 +75,6 @@ struct azx_dev { 
#define azx_stream(dev)		(&(dev)->core)

#define stream_to_azx_dev(s)	container_of(s, struct azx_dev, core)



/* CORB/RIRB */

struct azx_rb {

	u32 *buf;		/* CORB/RIRB buffer

				 * Each CORB entry is 4byte, RIRB is 8byte

				 */

	dma_addr_t addr;	/* physical address of CORB/RIRB buffer */

	/* for RIRB */

	unsigned short rp, wp;	/* read/write pointers */

	int cmds[AZX_MAX_CODECS];	/* number of pending requests */

	u32 res[AZX_MAX_CODECS];	/* last read value */

};



struct azx;



/* Functions to read/write to hda registers. */
@@ -116,6 +104,8 @@ typedef unsigned int (*azx_get_pos_callback_t)(struct azx *, struct azx_dev *); 
typedef int (*azx_get_delay_callback_t)(struct azx *, struct azx_dev *, unsigned int pos);



struct azx {

	struct hda_bus bus;



	struct snd_card *card;

	struct pci_dev *pci;

	int dev_index;
@@ -132,38 +122,21 @@ struct azx { 


	/* Register interaction. */

	const struct hda_controller_ops *ops;

	const struct hdac_io_ops *io_ops;



	/* position adjustment callbacks */

	azx_get_pos_callback_t get_position[2];

	azx_get_delay_callback_t get_delay[2];



	/* pci resources */

	unsigned long addr;

	void __iomem *remap_addr;

	int irq;



	/* locks */

	spinlock_t reg_lock;

	struct mutex open_mutex; /* Prevents concurrent open/close operations */



	/* PCM */

	struct list_head pcm_list; /* azx_pcm list */



	/* HD codec */

	unsigned short codec_mask;

	int  codec_probe_mask; /* copied from probe_mask option */

	struct hda_bus *bus;

	unsigned int beep_mode;



	/* CORB/RIRB */

	struct azx_rb corb;

	struct azx_rb rirb;



	/* CORB/RIRB and position buffers */

	struct snd_dma_buffer rb;

	struct snd_dma_buffer posbuf;



#ifdef CONFIG_SND_HDA_PATCH_LOADER

	const struct firmware *fw;

#endif
@@ -172,7 +145,6 @@ struct azx { 
	const int *bdl_pos_adj;

	int poll_count;

	unsigned int running:1;

	unsigned int initialized:1;

	unsigned int single_cmd:1;

	unsigned int polling_mode:1;

	unsigned int msi:1;
@@ -182,15 +154,13 @@ struct azx { 
	unsigned int region_requested:1;

	unsigned int disabled:1; /* disabled by VGA-switcher */



	/* for debugging */

	unsigned int last_cmd[AZX_MAX_CODECS];



#ifdef CONFIG_SND_HDA_DSP_LOADER

	struct azx_dev saved_azx_dev;

#endif

};



#define azx_bus(chip)	(&(chip)->bus->core)

#define azx_bus(chip)	(&(chip)->bus.core)

#define bus_to_azx(_bus)	container_of(_bus, struct azx, bus.core)



#ifdef CONFIG_X86

#define azx_snoop(chip)		((chip)->snoop)
@@ -203,17 +173,17 @@ struct azx { 
 */



#define azx_writel(chip, reg, value) \

	((chip)->io_ops->reg_writel(value, (chip)->remap_addr + AZX_REG_##reg))

	snd_hdac_chip_writel(azx_bus(chip), reg, value)

#define azx_readl(chip, reg) \

	((chip)->io_ops->reg_readl((chip)->remap_addr + AZX_REG_##reg))

	snd_hdac_chip_readl(azx_bus(chip), reg)

#define azx_writew(chip, reg, value) \

	((chip)->io_ops->reg_writew(value, (chip)->remap_addr + AZX_REG_##reg))

	snd_hdac_chip_writew(azx_bus(chip), reg, value)

#define azx_readw(chip, reg) \

	((chip)->io_ops->reg_readw((chip)->remap_addr + AZX_REG_##reg))

	snd_hdac_chip_readw(azx_bus(chip), reg)

#define azx_writeb(chip, reg, value) \

	((chip)->io_ops->reg_writeb(value, (chip)->remap_addr + AZX_REG_##reg))

	snd_hdac_chip_writeb(azx_bus(chip), reg, value)

#define azx_readb(chip, reg) \

	((chip)->io_ops->reg_readb((chip)->remap_addr + AZX_REG_##reg))

	snd_hdac_chip_readb(azx_bus(chip), reg)



#define azx_sd_writel(chip, dev, reg, value) \

	snd_hdac_stream_writel(&(dev)->core, reg, value)
@@ -244,19 +214,24 @@ unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev); 
void azx_stop_all_streams(struct azx *chip);



/* Allocation functions. */

int azx_alloc_stream_pages(struct azx *chip);

void azx_free_stream_pages(struct azx *chip);

#define azx_alloc_stream_pages(chip) \

	snd_hdac_bus_alloc_stream_pages(azx_bus(chip))

#define azx_free_stream_pages(chip) \

	snd_hdac_bus_free_stream_pages(azx_bus(chip))



/* Low level azx interface */

void azx_init_chip(struct azx *chip, bool full_reset);

void azx_stop_chip(struct azx *chip);

void azx_enter_link_reset(struct azx *chip);

#define azx_enter_link_reset(chip) \

	snd_hdac_bus_enter_link_reset(azx_bus(chip))

irqreturn_t azx_interrupt(int irq, void *dev_id);



/* Codec interface */

int azx_bus_create(struct azx *chip, const char *model);

int azx_bus_init(struct azx *chip, const char *model,

		 const struct hdac_io_ops *io_ops);

int azx_probe_codecs(struct azx *chip, unsigned int max_slots);

int azx_codec_configure(struct azx *chip);

int azx_init_stream(struct azx *chip);

int azx_init_streams(struct azx *chip);

void azx_free_streams(struct azx *chip);



#endif /* __SOUND_HDA_CONTROLLER_H */

sound/pci/hda/hda_intel.c

+77 −56
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static void azx_irq_pending_work(struct work_struct *work) 


	for (;;) {

		pending = 0;

		spin_lock_irq(&chip->reg_lock);

		spin_lock_irq(&bus->reg_lock);

		list_for_each_entry(s, &bus->stream_list, list) {

			struct azx_dev *azx_dev = stream_to_azx_dev(s);

			if (!azx_dev->irq_pending ||
@@ -624,15 +624,15 @@ static void azx_irq_pending_work(struct work_struct *work) 
			ok = azx_position_ok(chip, azx_dev);

			if (ok > 0) {

				azx_dev->irq_pending = 0;

				spin_unlock(&chip->reg_lock);

				spin_unlock(&bus->reg_lock);

				snd_pcm_period_elapsed(s->substream);

				spin_lock(&chip->reg_lock);

				spin_lock(&bus->reg_lock);

			} else if (ok < 0) {

				pending = 0;	/* too early */

			} else

				pending++;

		}

		spin_unlock_irq(&chip->reg_lock);

		spin_unlock_irq(&bus->reg_lock);

		if (!pending)

			return;

		msleep(1);
@@ -645,16 +645,18 @@ static void azx_clear_irq_pending(struct azx *chip) 
	struct hdac_bus *bus = azx_bus(chip);

	struct hdac_stream *s;



	spin_lock_irq(&chip->reg_lock);

	spin_lock_irq(&bus->reg_lock);

	list_for_each_entry(s, &bus->stream_list, list) {

		struct azx_dev *azx_dev = stream_to_azx_dev(s);

		azx_dev->irq_pending = 0;

	}

	spin_unlock_irq(&chip->reg_lock);

	spin_unlock_irq(&bus->reg_lock);

}



static int azx_acquire_irq(struct azx *chip, int do_disconnect)

{

	struct hdac_bus *bus = azx_bus(chip);



	if (request_irq(chip->pci->irq, azx_interrupt,

			chip->msi ? 0 : IRQF_SHARED,

			KBUILD_MODNAME, chip)) {
@@ -665,7 +667,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect) 
			snd_card_disconnect(chip->card);

		return -1;

	}

	chip->irq = chip->pci->irq;

	bus->irq = chip->pci->irq;

	pci_intx(chip->pci, !chip->msi);

	return 0;

}
@@ -694,7 +696,8 @@ static unsigned int azx_via_get_position(struct azx *chip, 
	/* azx_dev->fifo_size can't get FIFO size of in stream.

	 * Get from base address + offset.

	 */

	fifo_size = readw(chip->remap_addr + VIA_IN_STREAM0_FIFO_SIZE_OFFSET);

	fifo_size = readw(azx_bus(chip)->remap_addr +

			  VIA_IN_STREAM0_FIFO_SIZE_OFFSET);



	if (azx_dev->insufficient) {

		/* Link position never gather than FIFO size */
@@ -760,9 +763,9 @@ static int param_set_xint(const char *val, const struct kernel_param *kp) 
	mutex_lock(&card_list_lock);

	list_for_each_entry(hda, &card_list, list) {

		chip = &hda->chip;

		if (!chip->bus || chip->disabled)

		if (!hda->probe_continued || chip->disabled)

			continue;

		snd_hda_set_power_save(chip->bus, power_save * 1000);

		snd_hda_set_power_save(&chip->bus, power_save * 1000);

	}

	mutex_unlock(&card_list_lock);

	return 0;
@@ -781,6 +784,7 @@ static int azx_suspend(struct device *dev) 
	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip;

	struct hda_intel *hda;

	struct hdac_bus *bus;



	if (!card)

		return 0;
@@ -790,13 +794,14 @@ static int azx_suspend(struct device *dev) 
	if (chip->disabled || hda->init_failed)

		return 0;



	bus = azx_bus(chip);

	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	azx_clear_irq_pending(chip);

	azx_stop_chip(chip);

	azx_enter_link_reset(chip);

	if (chip->irq >= 0) {

		free_irq(chip->irq, chip);

		chip->irq = -1;

	if (bus->irq >= 0) {

		free_irq(bus->irq, chip);

		bus->irq = -1;

	}



	if (chip->msi)
@@ -875,7 +880,6 @@ static int azx_runtime_resume(struct device *dev) 
	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip;

	struct hda_intel *hda;

	struct hda_bus *bus;

	struct hda_codec *codec;

	int status;
@@ -901,9 +905,8 @@ static int azx_runtime_resume(struct device *dev) 
	azx_init_pci(chip);

	azx_init_chip(chip, true);



	bus = chip->bus;

	if (status && bus) {

		list_for_each_codec(codec, bus)

	if (status) {

		list_for_each_codec(codec, &chip->bus)

			if (status & (1 << codec->addr))

				schedule_delayed_work(&codec->jackpoll_work,

						      codec->jackpoll_interval);
@@ -931,7 +934,7 @@ static int azx_runtime_idle(struct device *dev) 
		return 0;



	if (!power_save_controller || !azx_has_pm_runtime(chip) ||

	    chip->bus->core.codec_powered)

	    azx_bus(chip)->codec_powered)

		return -EBUSY;



	return 0;
@@ -969,7 +972,7 @@ static void azx_vs_set_state(struct pci_dev *pci, 
	if (chip->disabled == disabled)

		return;



	if (!chip->bus) {

	if (!hda->probe_continued) {

		chip->disabled = disabled;

		if (!disabled) {

			dev_info(chip->card->dev,
@@ -990,11 +993,11 @@ static void azx_vs_set_state(struct pci_dev *pci, 
			 * put ourselves there */

			pci->current_state = PCI_D3cold;

			chip->disabled = true;

			if (snd_hda_lock_devices(chip->bus))

			if (snd_hda_lock_devices(&chip->bus))

				dev_warn(chip->card->dev,

					 "Cannot lock devices!\n");

		} else {

			snd_hda_unlock_devices(chip->bus);

			snd_hda_unlock_devices(&chip->bus);

			pm_runtime_get_noresume(card->dev);

			chip->disabled = false;

			azx_resume(card->dev);
@@ -1011,11 +1014,11 @@ static bool azx_vs_can_switch(struct pci_dev *pci) 
	wait_for_completion(&hda->probe_wait);

	if (hda->init_failed)

		return false;

	if (chip->disabled || !chip->bus)

	if (chip->disabled || !hda->probe_continued)

		return true;

	if (snd_hda_lock_devices(chip->bus))

	if (snd_hda_lock_devices(&chip->bus))

		return false;

	snd_hda_unlock_devices(chip->bus);

	snd_hda_unlock_devices(&chip->bus);

	return true;

}
@@ -1048,7 +1051,7 @@ static int register_vga_switcheroo(struct azx *chip) 
	 */

	err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops,

						    VGA_SWITCHEROO_DIS,

						    chip->bus != NULL);

						    hda->probe_continued);

	if (err < 0)

		return err;

	hda->vga_switcheroo_registered = 1;
@@ -1071,6 +1074,7 @@ static int azx_free(struct azx *chip) 
{

	struct pci_dev *pci = chip->pci;

	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);

	struct hdac_bus *bus = azx_bus(chip);



	if (azx_has_pm_runtime(chip) && chip->running)

		pm_runtime_get_noresume(&pci->dev);
@@ -1081,27 +1085,31 @@ static int azx_free(struct azx *chip) 
	complete_all(&hda->probe_wait);



	if (use_vga_switcheroo(hda)) {

		if (chip->disabled && chip->bus)

			snd_hda_unlock_devices(chip->bus);

		if (chip->disabled && hda->probe_continued)

			snd_hda_unlock_devices(&chip->bus);

		if (hda->vga_switcheroo_registered)

			vga_switcheroo_unregister_client(chip->pci);

	}



	if (chip->initialized) {

	if (bus->chip_init) {

		azx_clear_irq_pending(chip);

		azx_stop_all_streams(chip);

		azx_stop_chip(chip);

	}



	if (chip->irq >= 0)

		free_irq(chip->irq, (void*)chip);

	if (bus->irq >= 0)

		free_irq(bus->irq, (void*)chip);

	if (chip->msi)

		pci_disable_msi(chip->pci);

	iounmap(chip->remap_addr);

	iounmap(bus->remap_addr);



	azx_free_stream_pages(chip);

	azx_free_streams(chip);

	snd_hdac_bus_exit(bus);



	if (chip->region_requested)

		pci_release_regions(chip->pci);



	pci_disable_device(chip->pci);

#ifdef CONFIG_SND_HDA_PATCH_LOADER

	release_firmware(chip->fw);
@@ -1115,6 +1123,14 @@ static int azx_free(struct azx *chip) 
	return 0;

}



static int azx_dev_disconnect(struct snd_device *device)

{

	struct azx *chip = device->device_data;



	chip->bus.shutdown = 1;

	return 0;

}



static int azx_dev_free(struct snd_device *device)

{

	return azx_free(device->device_data);
@@ -1281,9 +1297,9 @@ static void check_probe_mask(struct azx *chip, int dev) 
	/* check forced option */

	if (chip->codec_probe_mask != -1 &&

	    (chip->codec_probe_mask & AZX_FORCE_CODEC_MASK)) {

		chip->codec_mask = chip->codec_probe_mask & 0xff;

		azx_bus(chip)->codec_mask = chip->codec_probe_mask & 0xff;

		dev_info(chip->card->dev, "codec_mask forced to 0x%x\n",

			 chip->codec_mask);

			 (int)azx_bus(chip)->codec_mask);

	}

}
@@ -1378,6 +1394,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 
		      struct azx **rchip)

{

	static struct snd_device_ops ops = {

		.dev_disconnect = azx_dev_disconnect,

		.dev_free = azx_dev_free,

	};

	struct hda_intel *hda;
@@ -1397,13 +1414,10 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 
	}



	chip = &hda->chip;

	spin_lock_init(&chip->reg_lock);

	mutex_init(&chip->open_mutex);

	chip->card = card;

	chip->pci = pci;

	chip->ops = &pci_hda_ops;

	chip->io_ops = &pci_hda_io_ops;

	chip->irq = -1;

	chip->driver_caps = driver_caps;

	chip->driver_type = driver_caps & 0xff;

	check_msi(chip);
@@ -1435,6 +1449,13 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 
	}

	chip->bdl_pos_adj = bdl_pos_adj;



	err = azx_bus_init(chip, model[dev], &pci_hda_io_ops);

	if (err < 0) {

		kfree(hda);

		pci_disable_device(pci);

		return err;

	}



	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);

	if (err < 0) {

		dev_err(card->dev, "Error creating device [card]!\n");
@@ -1455,6 +1476,7 @@ static int azx_first_init(struct azx *chip) 
	int dev = chip->dev_index;

	struct pci_dev *pci = chip->pci;

	struct snd_card *card = chip->card;

	struct hdac_bus *bus = azx_bus(chip);

	int err;

	unsigned short gcap;

	unsigned int dma_bits = 64;
@@ -1474,13 +1496,12 @@ static int azx_first_init(struct azx *chip) 
		return err;

	chip->region_requested = 1;



	chip->addr = pci_resource_start(pci, 0);

	chip->remap_addr = pci_ioremap_bar(pci, 0);

	if (chip->remap_addr == NULL) {

	bus->addr = pci_resource_start(pci, 0);

	bus->remap_addr = pci_ioremap_bar(pci, 0);

	if (bus->remap_addr == NULL) {

		dev_err(card->dev, "ioremap error\n");

		return -ENXIO;

	}

	azx_bus(chip)->remap_addr = chip->remap_addr; /* FIXME */



	if (chip->msi) {

		if (chip->driver_caps & AZX_DCAPS_NO_MSI64) {
@@ -1495,7 +1516,7 @@ static int azx_first_init(struct azx *chip) 
		return -EBUSY;



	pci_set_master(pci);

	synchronize_irq(chip->irq);

	synchronize_irq(bus->irq);



	gcap = azx_readw(chip, GCAP);

	dev_dbg(card->dev, "chipset global capabilities = 0x%x\n", gcap);
@@ -1573,12 +1594,14 @@ static int azx_first_init(struct azx *chip) 
	chip->playback_index_offset = chip->capture_streams;

	chip->num_streams = chip->playback_streams + chip->capture_streams;



	err = azx_alloc_stream_pages(chip);

	/* initialize streams */

	err = azx_init_streams(chip);

	if (err < 0)

		return err;



	/* initialize streams */

	azx_init_stream(chip);

	err = azx_alloc_stream_pages(chip);

	if (err < 0)

		return err;



	/* initialize chip */

	azx_init_pci(chip);
@@ -1593,7 +1616,7 @@ static int azx_first_init(struct azx *chip) 
	azx_init_chip(chip, (probe_only[dev] & 2) == 0);



	/* codec detection */

	if (!chip->codec_mask) {

	if (!azx_bus(chip)->codec_mask) {

		dev_err(card->dev, "no codecs found!\n");

		return -ENODEV;

	}
@@ -1603,7 +1626,7 @@ static int azx_first_init(struct azx *chip) 
		sizeof(card->shortname));

	snprintf(card->longname, sizeof(card->longname),

		 "%s at 0x%lx irq %i",

		 card->shortname, chip->addr, chip->irq);

		 card->shortname, bus->addr, bus->irq);



	return 0;

}
@@ -1672,10 +1695,11 @@ static u8 pci_azx_readb(u8 __iomem *addr) 


static int disable_msi_reset_irq(struct azx *chip)

{

	struct hdac_bus *bus = azx_bus(chip);

	int err;



	free_irq(chip->irq, chip);

	chip->irq = -1;

	free_irq(bus->irq, chip);

	bus->irq = -1;

	pci_disable_msi(chip->pci);

	chip->msi = 0;

	err = azx_acquire_irq(chip, 1);
@@ -1691,7 +1715,7 @@ static int dma_alloc_pages(struct hdac_bus *bus, 
			   size_t size,

			   struct snd_dma_buffer *buf)

{

	struct azx *chip = to_hda_bus(bus)->private_data;

	struct azx *chip = bus_to_azx(bus);

	int err;



	err = snd_dma_alloc_pages(type,
@@ -1705,7 +1729,7 @@ static int dma_alloc_pages(struct hdac_bus *bus, 


static void dma_free_pages(struct hdac_bus *bus, struct snd_dma_buffer *buf)

{

	struct azx *chip = to_hda_bus(bus)->private_data;

	struct azx *chip = bus_to_azx(bus);



	mark_pages_wc(chip, buf, false);

	snd_dma_free_pages(buf);
@@ -1857,6 +1881,7 @@ static int azx_probe_continue(struct azx *chip) 
	int dev = chip->dev_index;

	int err;



	hda->probe_continued = 1;

	/* Request power well for Haswell HDA controller and codec */

	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {

#ifdef CONFIG_SND_HDA_I915
@@ -1872,10 +1897,6 @@ static int azx_probe_continue(struct azx *chip) 
#endif

	}



	err = azx_bus_create(chip, model[dev]);

	if (err < 0)

		goto out_free;



	err = azx_first_init(chip);

	if (err < 0)

		goto out_free;
@@ -1891,7 +1912,7 @@ static int azx_probe_continue(struct azx *chip) 


#ifdef CONFIG_SND_HDA_PATCH_LOADER

	if (chip->fw) {

		err = snd_hda_load_patch(chip->bus, chip->fw->size,

		err = snd_hda_load_patch(&chip->bus, chip->fw->size,

					 chip->fw->data);

		if (err < 0)

			goto out_free;
@@ -1913,7 +1934,7 @@ static int azx_probe_continue(struct azx *chip) 


	chip->running = 1;

	azx_add_card_list(chip);

	snd_hda_set_power_save(chip->bus, power_save * 1000);

	snd_hda_set_power_save(&chip->bus, power_save * 1000);

	if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo)

		pm_runtime_put_noidle(&pci->dev);