From: maarten.lankhorst@linux.intel.com
To: intel-xe@lists.freedesktop.org
Subject: [Intel-xe] [PATCH 14/14] ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init
Date: Tue, 3 Oct 2023 14:00:33 +0200 [thread overview]
Message-ID: <20231003120033.3505-15-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20231003120033.3505-1-maarten.lankhorst@linux.intel.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Now that all drivers have moved from modprobe loading to
handling -EPROBE_DEFER, we can remove the argument again.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
---
include/sound/hda_i915.h | 4 ++--
sound/hda/hdac_i915.c | 14 +++-----------
sound/pci/hda/hda_intel.c | 2 +-
sound/soc/intel/avs/core.c | 2 +-
sound/soc/intel/skylake/skl.c | 2 +-
sound/soc/sof/intel/hda-codec.c | 2 +-
6 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/include/sound/hda_i915.h b/include/sound/hda_i915.h
index f91bd6636086..6b79614a893b 100644
--- a/include/sound/hda_i915.h
+++ b/include/sound/hda_i915.h
@@ -9,12 +9,12 @@
#ifdef CONFIG_SND_HDA_I915
void snd_hdac_i915_set_bclk(struct hdac_bus *bus);
-int snd_hdac_i915_init(struct hdac_bus *bus, bool allow_modprobe);
+int snd_hdac_i915_init(struct hdac_bus *bus);
#else
static inline void snd_hdac_i915_set_bclk(struct hdac_bus *bus)
{
}
-static inline int snd_hdac_i915_init(struct hdac_bus *bus, bool allow_modprobe)
+static inline int snd_hdac_i915_init(struct hdac_bus *bus)
{
return -ENODEV;
}
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index a984e7935ce7..862997beea1b 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -176,7 +176,7 @@ static bool dg1_gfx_present(void)
*
* Returns zero for success or a negative error code.
*/
-int snd_hdac_i915_init(struct hdac_bus *bus, bool allow_modprobe)
+int snd_hdac_i915_init(struct hdac_bus *bus)
{
struct drm_audio_component *acomp;
int err;
@@ -195,18 +195,10 @@ int snd_hdac_i915_init(struct hdac_bus *bus, bool allow_modprobe)
acomp = bus->audio_component;
if (!acomp)
return -ENODEV;
- if (allow_modprobe && !acomp->ops) {
- if (!IS_ENABLED(CONFIG_MODULES) ||
- !request_module("i915")) {
- /* 60s timeout */
- wait_for_completion_killable_timeout(&acomp->master_bind_complete,
- msecs_to_jiffies(60 * 1000));
- }
- }
if (!acomp->ops) {
- int err = allow_modprobe ? -ENODEV : -EPROBE_DEFER;
snd_hdac_acomp_exit(bus);
- return dev_err_probe(bus->dev, err, "couldn't bind with audio component\n");
+ return dev_err_probe(bus->dev, -EPROBE_DEFER,
+ "couldn't bind with audio component\n");
}
return 0;
}
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 9dad3607596a..058f6e6491f9 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2138,7 +2138,7 @@ static int azx_probe(struct pci_dev *pci,
#ifdef CONFIG_SND_HDA_I915
/* bind with i915 if needed */
if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {
- err = snd_hdac_i915_init(azx_bus(chip), false);
+ err = snd_hdac_i915_init(azx_bus(chip));
if (err < 0) {
/* if the controller is bound only with HDMI/DP
* (for HSW and BDW), we need to abort the probe;
diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 8a2063958248..33044f353575 100644
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -461,7 +461,7 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
pci_set_drvdata(pci, bus);
device_disable_async_suspend(dev);
- ret = snd_hdac_i915_init(bus, false);
+ ret = snd_hdac_i915_init(bus);
if (ret == -EPROBE_DEFER)
goto err_i915_init;
else if (ret < 0)
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 24bdbe2a53be..f46f109d5856 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -1056,7 +1056,7 @@ static int skl_probe(struct pci_dev *pci,
}
if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
- err = snd_hdac_i915_init(bus, false);
+ err = snd_hdac_i915_init(bus);
if (err < 0)
goto out_dmic_unregister;
}
diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c
index f1fd5b44aaac..8a5e99a898ec 100644
--- a/sound/soc/sof/intel/hda-codec.c
+++ b/sound/soc/sof/intel/hda-codec.c
@@ -415,7 +415,7 @@ int hda_codec_i915_init(struct snd_sof_dev *sdev)
return 0;
/* i915 exposes a HDA codec for HDMI audio */
- ret = snd_hdac_i915_init(bus, true);
+ ret = snd_hdac_i915_init(bus);
if (ret < 0)
return ret;
--
2.40.1
next prev parent reply other threads:[~2023-10-03 12:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 12:00 [Intel-xe] [PATCH 00/14] Update sound patches to upstreamable versions maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 01/14] Revert "sound/soc/sof: Remove deferred probe for SOF" maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 02/14] Revert "sound/hda: Allow XE as i915 replacement for sound" maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 03/14] ASoC/SOF/core: Ensure sof_ops_free() is still called when probe never ran maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 04/14] ASoC: SOF: core: Add probe_early and remove_late callbacks maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 05/14] ASoC: SOF: Intel: hda: start splitting the probe maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 06/14] ALSA: hda/intel: Fix error handling in azx_probe() maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 07/14] ALSA: hda/i915: Allow override of gpu binding maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 08/14] ALSA: hda/i915: Add an allow_modprobe argument to snd_hdac_i915_init maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 09/14] ALSA: hda/i915: Allow xe as match for i915_component_master_match maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 10/14] ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 11/14] ALSA: hda/intel: " maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 12/14] ASoC: Intel: Skylake: " maarten.lankhorst
2023-10-03 12:00 ` [Intel-xe] [PATCH 13/14] ASoC: SOF: Intel: Move binding to display driver outside of deferred probe maarten.lankhorst
2023-10-03 12:00 ` maarten.lankhorst [this message]
2023-10-03 12:18 ` [Intel-xe] ✓ CI.Patch_applied: success for Update sound patches to upstreamable versions Patchwork
2023-10-03 12:18 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-10-03 12:20 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-10-03 12:27 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-10-03 12:27 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-10-03 12:29 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-10-03 12:40 ` [Intel-xe] [PATCH 00/14] " Jani Nikula
2023-10-03 13:05 ` [Intel-xe] ✓ CI.BAT: success for " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-10-02 19:38 [Intel-xe] [PATCH 01/14] Revert "sound/soc/sof: Remove deferred probe for SOF" maarten.lankhorst
2023-10-02 19:38 ` [Intel-xe] [PATCH 14/14] ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init maarten.lankhorst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231003120033.3505-15-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox