Commit 696e2d9b authored by Mark Brown's avatar Mark Brown

ASoC: Intel: avs: Properly identify boards

Merge series from Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>:

Instead of using MODULE_ALIAS() to load boards, add proper device id
table and use MODULE_DEVICE_TABLE() macro to create board alias.
parents 82e340ca ca5abf5d
...@@ -277,16 +277,24 @@ static int avs_da7219_probe(struct platform_device *pdev) ...@@ -277,16 +277,24 @@ static int avs_da7219_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_da7219_driver_ids[] = {
{
.name = "avs_da7219",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_da7219_driver_ids);
static struct platform_driver avs_da7219_driver = { static struct platform_driver avs_da7219_driver = {
.probe = avs_da7219_probe, .probe = avs_da7219_probe,
.driver = { .driver = {
.name = "avs_da7219", .name = "avs_da7219",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_da7219_driver_ids,
}; };
module_platform_driver(avs_da7219_driver); module_platform_driver(avs_da7219_driver);
MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>"); MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_da7219");
...@@ -77,15 +77,23 @@ static int avs_dmic_probe(struct platform_device *pdev) ...@@ -77,15 +77,23 @@ static int avs_dmic_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_dmic_driver_ids[] = {
{
.name = "avs_dmic",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_dmic_driver_ids);
static struct platform_driver avs_dmic_driver = { static struct platform_driver avs_dmic_driver = {
.probe = avs_dmic_probe, .probe = avs_dmic_probe,
.driver = { .driver = {
.name = "avs_dmic", .name = "avs_dmic",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_dmic_driver_ids,
}; };
module_platform_driver(avs_dmic_driver); module_platform_driver(avs_dmic_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_dmic");
...@@ -307,15 +307,23 @@ static int avs_es8336_probe(struct platform_device *pdev) ...@@ -307,15 +307,23 @@ static int avs_es8336_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_es8336_driver_ids[] = {
{
.name = "avs_es8336",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_es8336_driver_ids);
static struct platform_driver avs_es8336_driver = { static struct platform_driver avs_es8336_driver = {
.probe = avs_es8336_probe, .probe = avs_es8336_probe,
.driver = { .driver = {
.name = "avs_es8336", .name = "avs_es8336",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_es8336_driver_ids,
}; };
module_platform_driver(avs_es8336_driver); module_platform_driver(avs_es8336_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_es8336");
...@@ -218,12 +218,21 @@ static int avs_hdaudio_probe(struct platform_device *pdev) ...@@ -218,12 +218,21 @@ static int avs_hdaudio_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_hdaudio_driver_ids[] = {
{
.name = "avs_hdaudio",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_hdaudio_driver_ids);
static struct platform_driver avs_hdaudio_driver = { static struct platform_driver avs_hdaudio_driver = {
.probe = avs_hdaudio_probe, .probe = avs_hdaudio_probe,
.driver = { .driver = {
.name = "avs_hdaudio", .name = "avs_hdaudio",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_hdaudio_driver_ids,
}; };
module_platform_driver(avs_hdaudio_driver) module_platform_driver(avs_hdaudio_driver)
...@@ -231,4 +240,3 @@ module_platform_driver(avs_hdaudio_driver) ...@@ -231,4 +240,3 @@ module_platform_driver(avs_hdaudio_driver)
MODULE_DESCRIPTION("Intel HD-Audio machine driver"); MODULE_DESCRIPTION("Intel HD-Audio machine driver");
MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>"); MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_hdaudio");
...@@ -185,15 +185,23 @@ static int avs_i2s_test_probe(struct platform_device *pdev) ...@@ -185,15 +185,23 @@ static int avs_i2s_test_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_i2s_test_driver_ids[] = {
{
.name = "avs_i2s_test",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_i2s_test_driver_ids);
static struct platform_driver avs_i2s_test_driver = { static struct platform_driver avs_i2s_test_driver = {
.probe = avs_i2s_test_probe, .probe = avs_i2s_test_probe,
.driver = { .driver = {
.name = "avs_i2s_test", .name = "avs_i2s_test",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_i2s_test_driver_ids,
}; };
module_platform_driver(avs_i2s_test_driver); module_platform_driver(avs_i2s_test_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_i2s_test");
...@@ -135,15 +135,23 @@ static int avs_max98357a_probe(struct platform_device *pdev) ...@@ -135,15 +135,23 @@ static int avs_max98357a_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_max98357a_driver_ids[] = {
{
.name = "avs_max98357a",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_max98357a_driver_ids);
static struct platform_driver avs_max98357a_driver = { static struct platform_driver avs_max98357a_driver = {
.probe = avs_max98357a_probe, .probe = avs_max98357a_probe,
.driver = { .driver = {
.name = "avs_max98357a", .name = "avs_max98357a",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_max98357a_driver_ids,
}; };
module_platform_driver(avs_max98357a_driver) module_platform_driver(avs_max98357a_driver)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_max98357a");
...@@ -192,15 +192,23 @@ static int avs_max98373_probe(struct platform_device *pdev) ...@@ -192,15 +192,23 @@ static int avs_max98373_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_max98373_driver_ids[] = {
{
.name = "avs_max98373",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_max98373_driver_ids);
static struct platform_driver avs_max98373_driver = { static struct platform_driver avs_max98373_driver = {
.probe = avs_max98373_probe, .probe = avs_max98373_probe,
.driver = { .driver = {
.name = "avs_max98373", .name = "avs_max98373",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_max98373_driver_ids,
}; };
module_platform_driver(avs_max98373_driver) module_platform_driver(avs_max98373_driver)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_max98373");
...@@ -189,15 +189,23 @@ static int avs_max98927_probe(struct platform_device *pdev) ...@@ -189,15 +189,23 @@ static int avs_max98927_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_max98927_driver_ids[] = {
{
.name = "avs_max98927",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_max98927_driver_ids);
static struct platform_driver avs_max98927_driver = { static struct platform_driver avs_max98927_driver = {
.probe = avs_max98927_probe, .probe = avs_max98927_probe,
.driver = { .driver = {
.name = "avs_max98927", .name = "avs_max98927",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_max98927_driver_ids,
}; };
module_platform_driver(avs_max98927_driver) module_platform_driver(avs_max98927_driver)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_max98927");
...@@ -294,15 +294,23 @@ static int avs_nau8825_probe(struct platform_device *pdev) ...@@ -294,15 +294,23 @@ static int avs_nau8825_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_nau8825_driver_ids[] = {
{
.name = "avs_nau8825",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_nau8825_driver_ids);
static struct platform_driver avs_nau8825_driver = { static struct platform_driver avs_nau8825_driver = {
.probe = avs_nau8825_probe, .probe = avs_nau8825_probe,
.driver = { .driver = {
.name = "avs_nau8825", .name = "avs_nau8825",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_nau8825_driver_ids,
}; };
module_platform_driver(avs_nau8825_driver) module_platform_driver(avs_nau8825_driver)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_nau8825");
...@@ -50,15 +50,23 @@ static int avs_probe_mb_probe(struct platform_device *pdev) ...@@ -50,15 +50,23 @@ static int avs_probe_mb_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_probe_mb_driver_ids[] = {
{
.name = "avs_probe_mb",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_probe_mb_driver_ids);
static struct platform_driver avs_probe_mb_driver = { static struct platform_driver avs_probe_mb_driver = {
.probe = avs_probe_mb_probe, .probe = avs_probe_mb_probe,
.driver = { .driver = {
.name = "avs_probe_mb", .name = "avs_probe_mb",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_probe_mb_driver_ids,
}; };
module_platform_driver(avs_probe_mb_driver); module_platform_driver(avs_probe_mb_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_probe_mb");
...@@ -257,15 +257,23 @@ static int avs_rt274_probe(struct platform_device *pdev) ...@@ -257,15 +257,23 @@ static int avs_rt274_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_rt274_driver_ids[] = {
{
.name = "avs_rt274",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_rt274_driver_ids);
static struct platform_driver avs_rt274_driver = { static struct platform_driver avs_rt274_driver = {
.probe = avs_rt274_probe, .probe = avs_rt274_probe,
.driver = { .driver = {
.name = "avs_rt274", .name = "avs_rt274",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_rt274_driver_ids,
}; };
module_platform_driver(avs_rt274_driver); module_platform_driver(avs_rt274_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_rt274");
...@@ -228,15 +228,23 @@ static int avs_rt286_probe(struct platform_device *pdev) ...@@ -228,15 +228,23 @@ static int avs_rt286_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_rt286_driver_ids[] = {
{
.name = "avs_rt286",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_rt286_driver_ids);
static struct platform_driver avs_rt286_driver = { static struct platform_driver avs_rt286_driver = {
.probe = avs_rt286_probe, .probe = avs_rt286_probe,
.driver = { .driver = {
.name = "avs_rt286", .name = "avs_rt286",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_rt286_driver_ids,
}; };
module_platform_driver(avs_rt286_driver); module_platform_driver(avs_rt286_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_rt286");
...@@ -247,15 +247,23 @@ static int avs_rt298_probe(struct platform_device *pdev) ...@@ -247,15 +247,23 @@ static int avs_rt298_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_rt298_driver_ids[] = {
{
.name = "avs_rt298",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_rt298_driver_ids);
static struct platform_driver avs_rt298_driver = { static struct platform_driver avs_rt298_driver = {
.probe = avs_rt298_probe, .probe = avs_rt298_probe,
.driver = { .driver = {
.name = "avs_rt298", .name = "avs_rt298",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_rt298_driver_ids,
}; };
module_platform_driver(avs_rt298_driver); module_platform_driver(avs_rt298_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_rt298");
...@@ -173,15 +173,23 @@ static int avs_rt5514_probe(struct platform_device *pdev) ...@@ -173,15 +173,23 @@ static int avs_rt5514_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_rt5514_driver_ids[] = {
{
.name = "avs_rt5514",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_rt5514_driver_ids);
static struct platform_driver avs_rt5514_driver = { static struct platform_driver avs_rt5514_driver = {
.probe = avs_rt5514_probe, .probe = avs_rt5514_probe,
.driver = { .driver = {
.name = "avs_rt5514", .name = "avs_rt5514",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_rt5514_driver_ids,
}; };
module_platform_driver(avs_rt5514_driver); module_platform_driver(avs_rt5514_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_rt5514");
...@@ -246,15 +246,23 @@ static int avs_rt5663_probe(struct platform_device *pdev) ...@@ -246,15 +246,23 @@ static int avs_rt5663_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_rt5663_driver_ids[] = {
{
.name = "avs_rt5663",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_rt5663_driver_ids);
static struct platform_driver avs_rt5663_driver = { static struct platform_driver avs_rt5663_driver = {
.probe = avs_rt5663_probe, .probe = avs_rt5663_probe,
.driver = { .driver = {
.name = "avs_rt5663", .name = "avs_rt5663",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_rt5663_driver_ids,
}; };
module_platform_driver(avs_rt5663_driver); module_platform_driver(avs_rt5663_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_rt5663");
...@@ -322,16 +322,24 @@ static int avs_rt5682_probe(struct platform_device *pdev) ...@@ -322,16 +322,24 @@ static int avs_rt5682_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_rt5682_driver_ids[] = {
{
.name = "avs_rt5682",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_rt5682_driver_ids);
static struct platform_driver avs_rt5682_driver = { static struct platform_driver avs_rt5682_driver = {
.probe = avs_rt5682_probe, .probe = avs_rt5682_probe,
.driver = { .driver = {
.name = "avs_rt5682", .name = "avs_rt5682",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_rt5682_driver_ids,
}; };
module_platform_driver(avs_rt5682_driver) module_platform_driver(avs_rt5682_driver)
MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>"); MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_rt5682");
...@@ -181,15 +181,23 @@ static int avs_ssm4567_probe(struct platform_device *pdev) ...@@ -181,15 +181,23 @@ static int avs_ssm4567_probe(struct platform_device *pdev)
return devm_snd_soc_register_card(dev, card); return devm_snd_soc_register_card(dev, card);
} }
static const struct platform_device_id avs_ssm4567_driver_ids[] = {
{
.name = "avs_ssm4567",
},
{},
};
MODULE_DEVICE_TABLE(platform, avs_ssm4567_driver_ids);
static struct platform_driver avs_ssm4567_driver = { static struct platform_driver avs_ssm4567_driver = {
.probe = avs_ssm4567_probe, .probe = avs_ssm4567_probe,
.driver = { .driver = {
.name = "avs_ssm4567", .name = "avs_ssm4567",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.id_table = avs_ssm4567_driver_ids,
}; };
module_platform_driver(avs_ssm4567_driver) module_platform_driver(avs_ssm4567_driver)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:avs_ssm4567");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment