diff --git a/include/sound/soc.h b/include/sound/soc.h
index a94e5d2fc2b2..9787c80e548b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -960,9 +960,6 @@ struct snd_soc_codec_conf {
 	 * specify device either by device name, or by
 	 * DT/OF node, but not both.
 	 */
-	const char *dev_name;
-	struct device_node *of_node;
-
 	struct snd_soc_dai_link_component dlc;
 
 	/*
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 411b83ba2fc0..0bd2cb2e7a67 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1185,12 +1185,6 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
 	for (i = 0; i < card->num_configs; i++) {
 		struct snd_soc_codec_conf *map = &card->codec_conf[i];
 
-		/* fixme */
-		if (map->dev_name)
-			map->dlc.name = map->dev_name;
-		if (map->of_node)
-			map->dlc.of_node = map->of_node;
-
 		if (snd_soc_is_matching_component(&map->dlc, component)) {
 			component->name_prefix = map->name_prefix;
 			return;