Merge branch 'for-linus' into for-next

[linux-2.6-microblaze.git] / sound / pci / hda / hda_tegra.c

diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index e519158..773992a 100644 (file)
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -166,11 +166,9 @@ static int __maybe_unused hda_tegra_runtime_suspend(struct device *dev)
        struct snd_card *card = dev_get_drvdata(dev);
        struct azx *chip = card->private_data;
        struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);
-       struct hdac_bus *bus = azx_bus(chip);
 
        if (chip && chip->running) {
                azx_stop_chip(chip);
-               synchronize_irq(bus->irq);
                azx_enter_link_reset(chip);
        }
        hda_tegra_disable_clocks(hda);
@@ -298,8 +296,7 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
                return err;
        }
        bus->irq = irq_id;
-
-       synchronize_irq(bus->irq);
+       card->sync_irq = bus->irq;
 
        gcap = azx_readw(chip, GCAP);
        dev_dbg(card->dev, "chipset global capabilities = 0x%x\n", gcap);
@@ -369,7 +366,7 @@ static int hda_tegra_create(struct snd_card *card,
                            unsigned int driver_caps,
                            struct hda_tegra *hda)
 {
-       static struct snd_device_ops ops = {
+       static const struct snd_device_ops ops = {
                .dev_disconnect = hda_tegra_dev_disconnect,
                .dev_free = hda_tegra_dev_free,
        };
@@ -397,7 +394,7 @@ static int hda_tegra_create(struct snd_card *card,
        if (err < 0)
                return err;
 
-       chip->bus.needs_damn_long_delay = 1;
+       chip->bus.core.needs_damn_long_delay = 1;
        chip->bus.core.aligned_mmio = 1;
 
        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);