ALSA: hda: Drop old codec binding method

Now that all patch_ops usage have been converted to the new
hda_codec_ops probe, we can drop patch_ops from the hda_codec,
together with the calls of patch_ops callbacks.

The hda_codec_ops.free callback is removed as all have been replaced
with the new remove callback.

Also, correct comments mentioning "patch"; it's replaced with "codec
driver".

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250709160434.1859-25-tiwai@suse.de

diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h
index a725ac48c20c4ba4196e08288b891deb54bce209..ddc9c392f93f6db45209db10bffdb44efe8b3474 100644 (file)
--- a/include/sound/hda_codec.h
+++ b/include/sound/hda_codec.h
@@ -70,12 +70,8 @@ struct hda_bus {
 
 /*
  * codec preset
- *
- * Known codecs have the patch to build and set up the controls/PCMs
- * better than the generic parser.
  */
-typedef int (*hda_codec_patch_t)(struct hda_codec *);
-       
+
 #define HDA_CODEC_ID_SKIP_PROBE                0x00000001
 #define HDA_CODEC_ID_GENERIC_HDMI      0x00000101
 #define HDA_CODEC_ID_GENERIC           0x00000201
@@ -90,14 +86,6 @@ typedef int (*hda_codec_patch_t)(struct hda_codec *);
 #define HDA_CODEC_ID(_vid, _name) \
        HDA_CODEC_ID_REV(_vid, 0, _name)
 
-/* old macros for patch_ops -- to be deprecated */
-#define HDA_CODEC_REV_ENTRY(_vid, _rev, _name, _patch) \
-       { .vendor_id = (_vid), .rev_id = (_rev), .name = (_name), \
-         .api_version = HDA_DEV_LEGACY, \
-         .driver_data = (unsigned long)(_patch) }
-#define HDA_CODEC_ENTRY(_vid, _name, _patch) \
-       HDA_CODEC_REV_ENTRY(_vid, 0, _name, _patch)
-
 struct hda_codec_driver {
        struct hdac_driver core;
        const struct hda_device_id *id;
@@ -116,14 +104,13 @@ void hda_codec_driver_unregister(struct hda_codec_driver *drv);
        module_driver(drv, hda_codec_driver_register, \
                      hda_codec_driver_unregister)
 
-/* ops set by the preset patch */
+/* ops for hda codec driver */
 struct hda_codec_ops {
        int (*probe)(struct hda_codec *codec, const struct hda_device_id *id);
        void (*remove)(struct hda_codec *codec);
        int (*build_controls)(struct hda_codec *codec);
        int (*build_pcms)(struct hda_codec *codec);
        int (*init)(struct hda_codec *codec);
-       void (*free)(struct hda_codec *codec);
        void (*unsol_event)(struct hda_codec *codec, unsigned int res);
        void (*set_power_state)(struct hda_codec *codec, hda_nid_t fg,
                                unsigned int power_state);
@@ -199,9 +186,6 @@ struct hda_codec {
        const struct hda_device_id *preset;
        const char *modelname;  /* model name for preset */
 
-       /* set by patch */
-       struct hda_codec_ops patch_ops;
-
        /* PCM to create, set by hda_codec_ops.build_pcms callback */
        struct list_head pcm_list_head;
        refcount_t pcm_ref;
@@ -500,8 +484,6 @@ int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid)
 
        if (driver->ops && driver->ops->check_power_status)
                return driver->ops->check_power_status(codec, nid);
-       else if (codec->patch_ops.check_power_status)
-               return codec->patch_ops.check_power_status(codec, nid);
        return 0;
 }
 

diff --git a/sound/hda/Makefile b/sound/hda/Makefile
index 31b9fbedaa77ee275ba6ab25d85e58b43eed0f07..d9a6def582efdd9d32baa432b4e75d9ac393f699 100644 (file)
--- a/sound/hda/Makefile
+++ b/sound/hda/Makefile
@@ -3,6 +3,6 @@ obj-y += core/
 obj-$(CONFIG_SND_HDA) += common/
 obj-$(CONFIG_SND_HDA) += codecs/
 # this must be the last entry after codec drivers;
-# otherwise the codec patches won't be hooked before the PCI probe
+# otherwise the codec drivers won't be hooked before the PCI probe
 # when built in kernel
 obj-$(CONFIG_SND_HDA) += controllers/

diff --git a/sound/hda/codecs/generic.c b/sound/hda/codecs/generic.c
index 82c31b93424cf043bafa3174b7d76b08e16fc67c..044f1d0aeaea98bfde086a7c770a09cc9ed958e7 100644 (file)
--- a/sound/hda/codecs/generic.c
+++ b/sound/hda/codecs/generic.c
@@ -5190,8 +5190,6 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
        if (spec->power_down_unused || codec->power_save_node) {
                if (!codec->power_filter)
                        codec->power_filter = snd_hda_gen_path_power_filter;
-               if (!codec->patch_ops.stream_pm)
-                       codec->patch_ops.stream_pm = snd_hda_gen_stream_pm;
        }
 
        if (!spec->no_analog && spec->beep_nid) {
@@ -6103,15 +6101,6 @@ EXPORT_SYMBOL_GPL(snd_hda_gen_check_power_status);
  * the generic codec support
  */
 
-static const struct hda_codec_ops generic_patch_ops = {
-       .build_controls = snd_hda_gen_build_controls,
-       .build_pcms = snd_hda_gen_build_pcms,
-       .init = snd_hda_gen_init,
-       .free = snd_hda_gen_free,
-       .unsol_event = snd_hda_jack_unsol_event,
-       .check_power_status = snd_hda_gen_check_power_status,
-};
-
 static int snd_hda_gen_probe(struct hda_codec *codec,
                             const struct hda_device_id *id)
 {
@@ -6132,7 +6121,6 @@ static int snd_hda_gen_probe(struct hda_codec *codec,
        if (err < 0)
                goto error;
 
-       codec->patch_ops = generic_patch_ops;
        return 0;
 
 error:

diff --git a/sound/hda/codecs/generic.h b/sound/hda/codecs/generic.h
index 00a92fc55846227c17535803d90fa51dec0f65c4..524591821f8c98d8ffcb015bbd2784c5a8ab4eee 100644 (file)
--- a/sound/hda/codecs/generic.h
+++ b/sound/hda/codecs/generic.h
@@ -312,7 +312,6 @@ int snd_hda_gen_spec_init(struct hda_gen_spec *spec);
 
 int snd_hda_gen_init(struct hda_codec *codec);
 void snd_hda_gen_remove(struct hda_codec *codec);
-#define snd_hda_gen_free       snd_hda_gen_remove
 
 int snd_hda_get_path_idx(struct hda_codec *codec, struct nid_path *path);
 struct nid_path *snd_hda_get_path_from_idx(struct hda_codec *codec, int idx);

diff --git a/sound/hda/codecs/hdmi/hdmi_local.h b/sound/hda/codecs/hdmi/hdmi_local.h
index 0654013f1fdacce654d42fa6dde8154701cf8434..548241ad3fa99314c8e3dbf56a309451ae0fefc2 100644 (file)
--- a/sound/hda/codecs/hdmi/hdmi_local.h
+++ b/sound/hda/codecs/hdmi/hdmi_local.h
@@ -57,7 +57,7 @@ struct hdmi_spec_per_pin {
 #endif
 };
 
-/* operations used by generic code that can be overridden by patches */
+/* operations used by generic code that can be overridden by codec drivers */
 struct hdmi_ops {
        int (*pin_get_eld)(struct hda_codec *codec, hda_nid_t pin_nid,
                           int dev_id, unsigned char *buf, int *eld_size);

diff --git a/sound/hda/common/bind.c b/sound/hda/common/bind.c
index 56975178f53390010c80f920fbadd951749c9bb0..f85c640dd54fa5407026542f59ffad846f3630ad 100644 (file)
--- a/sound/hda/common/bind.c
+++ b/sound/hda/common/bind.c
@@ -54,8 +54,6 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev)
 
        if (driver->ops && driver->ops->unsol_event)
                driver->ops->unsol_event(codec, ev);
-       else if (codec->patch_ops.unsol_event)
-               codec->patch_ops.unsol_event(codec, ev);
 }
 
 /**
@@ -91,7 +89,6 @@ static int hda_codec_driver_probe(struct device *dev)
        struct hda_codec *codec = dev_to_hda_codec(dev);
        struct module *owner = dev->driver->owner;
        struct hda_codec_driver *driver = hda_codec_to_driver(codec);
-       hda_codec_patch_t patch;
        int err;
 
        if (codec->bus->core.ext_ops) {
@@ -115,19 +112,14 @@ static int hda_codec_driver_probe(struct device *dev)
                goto error;
        }
 
-       if (driver->ops && driver->ops->probe) {
-               err = driver->ops->probe(codec, codec->preset);
-               if (err < 0)
-                       goto error_module_put;
-       } else {
-               patch = (hda_codec_patch_t)codec->preset->driver_data;
-               if (patch) {
-                       err = patch(codec);
-                       if (err < 0)
-                               goto error_module_put;
-               }
+       if (WARN_ON(!(driver->ops && driver->ops->probe))) {
+               err = -EINVAL;
+               goto error_module_put;
        }
 
+       err = driver->ops->probe(codec, codec->preset);
+       if (err < 0)
+               goto error_module_put;
        err = snd_hda_codec_build_pcms(codec);
        if (err < 0)
                goto error_module;
@@ -148,8 +140,6 @@ static int hda_codec_driver_probe(struct device *dev)
  error_module:
        if (driver->ops && driver->ops->remove)
                driver->ops->remove(codec);
-       else if (codec->patch_ops.free)
-               codec->patch_ops.free(codec);
  error_module_put:
        module_put(owner);
 
@@ -178,8 +168,6 @@ static int hda_codec_driver_remove(struct device *dev)
 
        if (driver->ops && driver->ops->remove)
                driver->ops->remove(codec);
-       else if (codec->patch_ops.free)
-               codec->patch_ops.free(codec);
        snd_hda_codec_cleanup_for_unbind(codec);
        codec->preset = NULL;
        module_put(dev->driver->owner);
@@ -320,7 +308,7 @@ static int codec_bind_generic(struct hda_codec *codec)
  * @codec: the HDA codec
  *
  * Start parsing of the given codec tree and (re-)initialize the whole
- * patch instance.
+ * codec driver binding.
  *
  * Returns 0 if successful or a negative error code.
  */

diff --git a/sound/hda/common/codec.c b/sound/hda/common/codec.c
index 8899be764d689aea16eca77bcfc5f629143941ae..33121d00208711f97e4883135548ec57fa0a84fb 100644 (file)
--- a/sound/hda/common/codec.c
+++ b/sound/hda/common/codec.c
@@ -766,7 +766,6 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec)
                snd_hda_ctls_clear(codec);
        codec_release_pcms(codec);
        snd_hda_detach_beep_device(codec);
-       memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));
        snd_hda_jack_tbl_clear(codec);
        codec->proc_widget_hook = NULL;
        codec->spec = NULL;
@@ -1132,8 +1131,6 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
 
        if (driver->ops && driver->ops->stream_pm)
                driver->ops->stream_pm(codec, nid, true);
-       else if (codec->patch_ops.stream_pm)
-               codec->patch_ops.stream_pm(codec, nid, true);
        if (codec->pcm_format_first)
                update_pcm_format(codec, p, nid, format);
        update_pcm_stream_id(codec, p, nid, stream_tag, channel_id);
@@ -1205,8 +1202,6 @@ static void really_cleanup_stream(struct hda_codec *codec,
        q->nid = nid;
        if (driver->ops && driver->ops->stream_pm)
                driver->ops->stream_pm(codec, nid, false);
-       else if (codec->patch_ops.stream_pm)
-               codec->patch_ops.stream_pm(codec, nid, false);
 }
 
 /* clean up the all conflicting obsolete streams */
@@ -2397,7 +2392,7 @@ static const struct snd_kcontrol_new dig_mixes[] = {
  * @cvt_nid: converter NID
  * @type: HDA_PCM_TYPE_*
  * Creates controls related with the digital output.
- * Called from each patch supporting the digital out.
+ * Called from each codec driver supporting the digital out.
  *
  * Returns 0 if successful, or a negative error code.
  */
@@ -2656,7 +2651,7 @@ static const struct snd_kcontrol_new dig_in_ctls[] = {
  * @nid: audio in widget NID
  *
  * Creates controls related with the SPDIF input.
- * Called from each patch supporting the SPDIF in.
+ * Called from each codec driver supporting the SPDIF in.
  *
  * Returns 0 if successful, or a negative error code.
  */
@@ -2773,9 +2768,6 @@ static unsigned int hda_set_power_state(struct hda_codec *codec,
                /* might be called before binding to driver, too */
                if (driver && driver->ops && driver->ops->set_power_state)
                        driver->ops->set_power_state(codec, fg, power_state);
-               else if (codec->patch_ops.set_power_state)
-                       codec->patch_ops.set_power_state(codec, fg,
-                                                        power_state);
                else {
                        state = power_state;
                        if (codec->power_filter)
@@ -2859,8 +2851,6 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec)
        snd_hdac_enter_pm(&codec->core);
        if (driver->ops && driver->ops->suspend)
                driver->ops->suspend(codec);
-       else if (codec->patch_ops.suspend)
-               codec->patch_ops.suspend(codec);
        if (!codec->no_stream_clean_at_suspend)
                hda_cleanup_all_streams(codec);
        state = hda_set_power_state(codec, AC_PWRST_D3);
@@ -2888,8 +2878,6 @@ static void hda_call_codec_resume(struct hda_codec *codec)
        snd_hda_jack_set_dirty_all(codec);
        if (driver->ops && driver->ops->resume)
                driver->ops->resume(codec);
-       else if (codec->patch_ops.resume)
-               codec->patch_ops.resume(codec);
        else {
                snd_hda_codec_init(codec);
                snd_hda_regmap_sync(codec);
@@ -3085,8 +3073,6 @@ int snd_hda_codec_build_controls(struct hda_codec *codec)
        if (!err) {
                if (driver->ops && driver->ops->build_controls)
                        err = driver->ops->build_controls(codec);
-               else if (codec->patch_ops.build_controls)
-                       err = codec->patch_ops.build_controls(codec);
                if (err < 0)
                        return err;
        }
@@ -3284,8 +3270,6 @@ int snd_hda_codec_parse_pcms(struct hda_codec *codec)
 
        if (driver->ops && driver->ops->build_pcms)
                err = driver->ops->build_pcms(codec);
-       else if (codec->patch_ops.build_pcms)
-               err = codec->patch_ops.build_pcms(codec);
        else
                return 0;
 

diff --git a/sound/hda/common/hda_local.h b/sound/hda/common/hda_local.h
index 654fe1156d5688ebafd90eb37a3c6a9b8f2d399d..e56bea4c93571e1465cb7f7391be0cd73b2cfbaa 100644 (file)
--- a/sound/hda/common/hda_local.h
+++ b/sound/hda/common/hda_local.h
@@ -658,8 +658,6 @@ static inline int snd_hda_codec_init(struct hda_codec *codec)
 
        if (driver->ops && driver->ops->init)
                return driver->ops->init(codec);
-       else if (codec->patch_ops.init)
-               return codec->patch_ops.init(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c
index ddb31001657ea24b219d7eced28fbb90761b656a..126270ffd418da09c7dc9f6563eb4b3585b3d305 100644 (file)
--- a/sound/soc/codecs/hda.c
+++ b/sound/soc/codecs/hda.c
@@ -177,7 +177,6 @@ static int hda_codec_probe(struct snd_soc_component *component)
        struct hdac_device *hdev = &codec->core;
        struct hdac_bus *bus = hdev->bus;
        struct hdac_ext_link *hlink;
-       hda_codec_patch_t patch;
        int ret;
 
 #ifdef CONFIG_PM
@@ -215,19 +214,12 @@ static int hda_codec_probe(struct snd_soc_component *component)
                goto err;
        }
 
-       if (driver->ops && driver->ops->probe) {
-               ret = driver->ops->probe(codec, codec->preset);
-       } else {
-               patch = (hda_codec_patch_t)codec->preset->driver_data;
-               if (!patch) {
-                       dev_err(&hdev->dev, "no patch specified\n");
-                       ret = -EINVAL;
-                       goto err;
-               }
-
-               ret = patch(codec);
+       if (WARN_ON(!(driver->ops && driver->ops->probe))) {
+               ret = -EINVAL;
+               goto err;
        }
 
+       ret = driver->ops->probe(codec, codec->preset);
        if (ret < 0) {
                dev_err(&hdev->dev, "codec init failed: %d\n", ret);
                goto err;
@@ -260,8 +252,6 @@ complete_err:
 parse_pcms_err:
        if (driver->ops && driver->ops->remove)
                driver->ops->remove(codec);
-       else if (codec->patch_ops.free)
-               codec->patch_ops.free(codec);
 err:
        snd_hda_codec_cleanup_for_unbind(codec);
 device_new_err:
@@ -292,8 +282,6 @@ static void hda_codec_remove(struct snd_soc_component *component)
 
        if (driver->ops && driver->ops->remove)
                driver->ops->remove(codec);
-       else if (codec->patch_ops.free)
-               codec->patch_ops.free(codec);
 
        snd_hda_codec_cleanup_for_unbind(codec);
        pm_runtime_put_noidle(&hdev->dev);

diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c
index 7bb7845d5e437ad438d256fd3eb170f0c96647ab..191cb842766419c7ed9a1ff9231fe6b84eed0ee2 100644 (file)
--- a/sound/soc/codecs/hdac_hda.c
+++ b/sound/soc/codecs/hdac_hda.c
@@ -411,7 +411,6 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
        struct hda_codec *hcodec = hda_pvt->codec;
        struct hda_codec_driver *driver = hda_codec_to_driver(hcodec);
        struct hdac_ext_link *hlink;
-       hda_codec_patch_t patch;
        int ret;
 
        hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev));
@@ -485,23 +484,15 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
                goto error_pm;
        }
 
-       if (driver->ops && driver->ops->probe) {
-               ret = driver->ops->probe(hcodec, hcodec->preset);
-               if (ret < 0) {
-                       dev_err(&hdev->dev, "%s: probe failed %d\n", __func__, ret);
-                       goto error_regmap;
-               }
-       } else {
-               patch = (hda_codec_patch_t)hcodec->preset->driver_data;
-               if (patch) {
-                       ret = patch(hcodec);
-                       if (ret < 0) {
-                               dev_err(&hdev->dev, "%s: patch failed %d\n", __func__, ret);
-                               goto error_regmap;
-                       }
-               } else {
-                       dev_dbg(&hdev->dev, "%s: no patch file found\n", __func__);
-               }
+       if (WARN_ON(!(driver->ops && driver->ops->probe))) {
+               ret = -EINVAL;
+               goto error_regmap;
+       }
+
+       ret = driver->ops->probe(hcodec, hcodec->preset);
+       if (ret < 0) {
+               dev_err(&hdev->dev, "%s: probe failed %d\n", __func__, ret);
+               goto error_regmap;
        }
 
        ret = snd_hda_codec_parse_pcms(hcodec);
@@ -542,8 +533,6 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
 error_patch:
        if (driver->ops && driver->ops->remove)
                driver->ops->remove(hcodec);
-       else if (hcodec->patch_ops.free)
-               hcodec->patch_ops.free(hcodec);
 error_regmap:
        snd_hdac_regmap_exit(hdev);
 error_pm:
@@ -573,8 +562,6 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component)
 
        if (driver->ops && driver->ops->remove)
                driver->ops->remove(codec);
-       else if (codec->patch_ops.free)
-               codec->patch_ops.free(codec);
 
        snd_hda_codec_cleanup_for_unbind(codec);
 }