redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

dt/sound: Eliminate users of of_platform_{,un}register_driver 

Get rid of users of of_platform_driver in drivers/sound.  The
of_platform_{,un}register_driver functions are going away, so the
users need to be converted to using the platform_bus_type directly.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
hifive-unleashed-5.1
Grant Likely 2011-02-22 21:05:04 -07:00
parent 18d306d137
commit f07eb223a0
8 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/fsl/fsl_dma.c
View File

@ -896,8 +896,7 @@ static struct snd_pcm_ops fsl_dma_ops = {
.pointer = fsl_dma_pointer, .pointer = fsl_dma_pointer,
}; };
static int __devinit fsl_soc_dma_probe(struct platform_device *pdev, static int __devinit fsl_soc_dma_probe(struct platform_device *pdev)
const struct of_device_id *match)
{ {
struct dma_object *dma; struct dma_object *dma;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
@ -979,7 +978,7 @@ static const struct of_device_id fsl_soc_dma_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, fsl_soc_dma_ids); MODULE_DEVICE_TABLE(of, fsl_soc_dma_ids);
static struct of_platform_driver fsl_soc_dma_driver = { static struct platform_driver fsl_soc_dma_driver = {
.driver = { .driver = {
.name = "fsl-pcm-audio", .name = "fsl-pcm-audio",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -993,12 +992,12 @@ static int __init fsl_soc_dma_init(void)
{ {
pr_info("Freescale Elo DMA ASoC PCM Driver\n"); pr_info("Freescale Elo DMA ASoC PCM Driver\n");
return of_register_platform_driver(&fsl_soc_dma_driver); return platform_driver_register(&fsl_soc_dma_driver);
} }
static void __exit fsl_soc_dma_exit(void) static void __exit fsl_soc_dma_exit(void)
{ {
of_unregister_platform_driver(&fsl_soc_dma_driver); platform_driver_unregister(&fsl_soc_dma_driver);
} }
module_init(fsl_soc_dma_init); module_init(fsl_soc_dma_init);

9
sound/soc/fsl/fsl_ssi.c
View File

@ -624,8 +624,7 @@ static void make_lowercase(char *s)
} }
} }
static int __devinit fsl_ssi_probe(struct platform_device *pdev, static int __devinit fsl_ssi_probe(struct platform_device *pdev)
const struct of_device_id *match)
{ {
struct fsl_ssi_private *ssi_private; struct fsl_ssi_private *ssi_private;
int ret = 0; int ret = 0;
@ -774,7 +773,7 @@ static const struct of_device_id fsl_ssi_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, fsl_ssi_ids); MODULE_DEVICE_TABLE(of, fsl_ssi_ids);
static struct of_platform_driver fsl_ssi_driver = { static struct platform_driver fsl_ssi_driver = {
.driver = { .driver = {
.name = "fsl-ssi-dai", .name = "fsl-ssi-dai",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -788,12 +787,12 @@ static int __init fsl_ssi_init(void)
{ {
printk(KERN_INFO "Freescale Synchronous Serial Interface (SSI) ASoC Driver\n"); printk(KERN_INFO "Freescale Synchronous Serial Interface (SSI) ASoC Driver\n");
return of_register_platform_driver(&fsl_ssi_driver); return platform_driver_register(&fsl_ssi_driver);
} }
static void __exit fsl_ssi_exit(void) static void __exit fsl_ssi_exit(void)
{ {
of_unregister_platform_driver(&fsl_ssi_driver); platform_driver_unregister(&fsl_ssi_driver);
} }
module_init(fsl_ssi_init); module_init(fsl_ssi_init);

24
sound/soc/fsl/mpc5200_dma.c
View File

@ -368,8 +368,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
.pcm_free = &psc_dma_free, .pcm_free = &psc_dma_free,
}; };
static int mpc5200_hpcd_probe(struct of_device *op, static int mpc5200_hpcd_probe(struct of_device *op)
const struct of_device_id *match)
{ {
phys_addr_t fifo; phys_addr_t fifo;
struct psc_dma *psc_dma; struct psc_dma *psc_dma;
@ -511,32 +510,31 @@ static int mpc5200_hpcd_remove(struct of_device *op)
} }
static struct of_device_id mpc5200_hpcd_match[] = { static struct of_device_id mpc5200_hpcd_match[] = {
{ { .compatible = "fsl,mpc5200-pcm", },
.compatible = "fsl,mpc5200-pcm",
},
{} {}
}; };
MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match); MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
static struct of_platform_driver mpc5200_hpcd_of_driver = { static struct platform_driver mpc5200_hpcd_of_driver = {
.owner = THIS_MODULE,
.name = "mpc5200-pcm-audio",
.match_table = mpc5200_hpcd_match,
.probe = mpc5200_hpcd_probe, .probe = mpc5200_hpcd_probe,
.remove = mpc5200_hpcd_remove, .remove = mpc5200_hpcd_remove,
.dev = {
.owner = THIS_MODULE,
.name = "mpc5200-pcm-audio",
.of_match_table = mpc5200_hpcd_match,
}
}; };
static int __init mpc5200_hpcd_init(void) static int __init mpc5200_hpcd_init(void)
{ {
return of_register_platform_driver(&mpc5200_hpcd_of_driver); return platform_driver_register(&mpc5200_hpcd_of_driver);
} }
module_init(mpc5200_hpcd_init);
static void __exit mpc5200_hpcd_exit(void) static void __exit mpc5200_hpcd_exit(void)
{ {
of_unregister_platform_driver(&mpc5200_hpcd_of_driver); platform_driver_unregister(&mpc5200_hpcd_of_driver);
} }
module_init(mpc5200_hpcd_init);
module_exit(mpc5200_hpcd_exit); module_exit(mpc5200_hpcd_exit);
MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>"); MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");

9
sound/soc/fsl/mpc5200_psc_ac97.c
View File

@ -272,8 +272,7 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
* - Probe/remove operations * - Probe/remove operations
* - OF device match table * - OF device match table
*/ */
static int __devinit psc_ac97_of_probe(struct platform_device *op, static int __devinit psc_ac97_of_probe(struct platform_device *op)
const struct of_device_id *match)
{ {
int rc; int rc;
struct snd_ac97 ac97; struct snd_ac97 ac97;
@ -316,7 +315,7 @@ static struct of_device_id psc_ac97_match[] __devinitdata = {
}; };
MODULE_DEVICE_TABLE(of, psc_ac97_match); MODULE_DEVICE_TABLE(of, psc_ac97_match);
static struct of_platform_driver psc_ac97_driver = { static struct platform_driver psc_ac97_driver = {
.probe = psc_ac97_of_probe, .probe = psc_ac97_of_probe,
.remove = __devexit_p(psc_ac97_of_remove), .remove = __devexit_p(psc_ac97_of_remove),
.driver = { .driver = {
@ -332,13 +331,13 @@ static struct of_platform_driver psc_ac97_driver = {
*/ */
static int __init psc_ac97_init(void) static int __init psc_ac97_init(void)
{ {
return of_register_platform_driver(&psc_ac97_driver); return platform_driver_register(&psc_ac97_driver);
} }
module_init(psc_ac97_init); module_init(psc_ac97_init);
static void __exit psc_ac97_exit(void) static void __exit psc_ac97_exit(void)
{ {
of_unregister_platform_driver(&psc_ac97_driver); platform_driver_unregister(&psc_ac97_driver);
} }
module_exit(psc_ac97_exit); module_exit(psc_ac97_exit);

9
sound/soc/fsl/mpc5200_psc_i2s.c
View File

@ -150,8 +150,7 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
* - Probe/remove operations * - Probe/remove operations
* - OF device match table * - OF device match table
*/ */
static int __devinit psc_i2s_of_probe(struct platform_device *op, static int __devinit psc_i2s_of_probe(struct platform_device *op)
const struct of_device_id *match)
{ {
int rc; int rc;
struct psc_dma *psc_dma; struct psc_dma *psc_dma;
@ -213,7 +212,7 @@ static struct of_device_id psc_i2s_match[] __devinitdata = {
}; };
MODULE_DEVICE_TABLE(of, psc_i2s_match); MODULE_DEVICE_TABLE(of, psc_i2s_match);
static struct of_platform_driver psc_i2s_driver = { static struct platform_driver psc_i2s_driver = {
.probe = psc_i2s_of_probe, .probe = psc_i2s_of_probe,
.remove = __devexit_p(psc_i2s_of_remove), .remove = __devexit_p(psc_i2s_of_remove),
.driver = { .driver = {
@ -229,13 +228,13 @@ static struct of_platform_driver psc_i2s_driver = {
*/ */
static int __init psc_i2s_init(void) static int __init psc_i2s_init(void)
{ {
return of_register_platform_driver(&psc_i2s_driver); return platform_driver_register(&psc_i2s_driver);
} }
module_init(psc_i2s_init); module_init(psc_i2s_init);
static void __exit psc_i2s_exit(void) static void __exit psc_i2s_exit(void)
{ {
of_unregister_platform_driver(&psc_i2s_driver); platform_driver_unregister(&psc_i2s_driver);
} }
module_exit(psc_i2s_exit); module_exit(psc_i2s_exit);

8
sound/sparc/amd7930.c
View File

@ -1002,7 +1002,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
return 0; return 0;
} }
static int __devinit amd7930_sbus_probe(struct platform_device *op, const struct of_device_id *match) static int __devinit amd7930_sbus_probe(struct platform_device *op)
{ {
struct resource *rp = &op->resource[0]; struct resource *rp = &op->resource[0];
static int dev_num; static int dev_num;
@ -1064,7 +1064,7 @@ static const struct of_device_id amd7930_match[] = {
{}, {},
}; };
static struct of_platform_driver amd7930_sbus_driver = { static struct platform_driver amd7930_sbus_driver = {
.driver = { .driver = {
.name = "audio", .name = "audio",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -1075,7 +1075,7 @@ static struct of_platform_driver amd7930_sbus_driver = {
static int __init amd7930_init(void) static int __init amd7930_init(void)
{ {
return of_register_platform_driver(&amd7930_sbus_driver); return platform_driver_register(&amd7930_sbus_driver);
} }
static void __exit amd7930_exit(void) static void __exit amd7930_exit(void)
@ -1092,7 +1092,7 @@ static void __exit amd7930_exit(void)
amd7930_list = NULL; amd7930_list = NULL;
of_unregister_platform_driver(&amd7930_sbus_driver); platform_driver_unregister(&amd7930_sbus_driver);
} }
module_init(amd7930_init); module_init(amd7930_init);

16
sound/sparc/cs4231.c
View File

@ -1856,7 +1856,7 @@ static int __devinit snd_cs4231_sbus_create(struct snd_card *card,
return 0; return 0;
} }
static int __devinit cs4231_sbus_probe(struct platform_device *op, const struct of_device_id *match) static int __devinit cs4231_sbus_probe(struct platform_device *op)
{ {
struct resource *rp = &op->resource[0]; struct resource *rp = &op->resource[0];
struct snd_card *card; struct snd_card *card;
@ -2048,7 +2048,7 @@ static int __devinit snd_cs4231_ebus_create(struct snd_card *card,
return 0; return 0;
} }
static int __devinit cs4231_ebus_probe(struct platform_device *op, const struct of_device_id *match) static int __devinit cs4231_ebus_probe(struct platform_device *op)
{ {
struct snd_card *card; struct snd_card *card;
int err; int err;
@ -2072,16 +2072,16 @@ static int __devinit cs4231_ebus_probe(struct platform_device *op, const struct
} }
#endif #endif
static int __devinit cs4231_probe(struct platform_device *op, const struct of_device_id *match) static int __devinit cs4231_probe(struct platform_device *op)
{ {
#ifdef EBUS_SUPPORT #ifdef EBUS_SUPPORT
if (!strcmp(op->dev.of_node->parent->name, "ebus")) if (!strcmp(op->dev.of_node->parent->name, "ebus"))
return cs4231_ebus_probe(op, match); return cs4231_ebus_probe(op);
#endif #endif
#ifdef SBUS_SUPPORT #ifdef SBUS_SUPPORT
if (!strcmp(op->dev.of_node->parent->name, "sbus") || if (!strcmp(op->dev.of_node->parent->name, "sbus") ||
!strcmp(op->dev.of_node->parent->name, "sbi")) !strcmp(op->dev.of_node->parent->name, "sbi"))
return cs4231_sbus_probe(op, match); return cs4231_sbus_probe(op);
#endif #endif
return -ENODEV; return -ENODEV;
} }
@ -2108,7 +2108,7 @@ static const struct of_device_id cs4231_match[] = {
MODULE_DEVICE_TABLE(of, cs4231_match); MODULE_DEVICE_TABLE(of, cs4231_match);
static struct of_platform_driver cs4231_driver = { static struct platform_driver cs4231_driver = {
.driver = { .driver = {
.name = "audio", .name = "audio",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -2120,12 +2120,12 @@ static struct of_platform_driver cs4231_driver = {
static int __init cs4231_init(void) static int __init cs4231_init(void)
{ {
return of_register_platform_driver(&cs4231_driver); return platform_driver_register(&cs4231_driver);
} }
static void __exit cs4231_exit(void) static void __exit cs4231_exit(void)
{ {
of_unregister_platform_driver(&cs4231_driver); platform_driver_unregister(&cs4231_driver);
} }
module_init(cs4231_init); module_init(cs4231_init);

8
sound/sparc/dbri.c
View File

@ -2592,7 +2592,7 @@ static void snd_dbri_free(struct snd_dbri *dbri)
(void *)dbri->dma, dbri->dma_dvma); (void *)dbri->dma, dbri->dma_dvma);
} }
static int __devinit dbri_probe(struct platform_device *op, const struct of_device_id *match) static int __devinit dbri_probe(struct platform_device *op)
{ {
struct snd_dbri *dbri; struct snd_dbri *dbri;
struct resource *rp; struct resource *rp;
@ -2686,7 +2686,7 @@ static const struct of_device_id dbri_match[] = {
MODULE_DEVICE_TABLE(of, dbri_match); MODULE_DEVICE_TABLE(of, dbri_match);
static struct of_platform_driver dbri_sbus_driver = { static struct platform_driver dbri_sbus_driver = {
.driver = { .driver = {
.name = "dbri", .name = "dbri",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -2699,12 +2699,12 @@ static struct of_platform_driver dbri_sbus_driver = {
/* Probe for the dbri chip and then attach the driver. */ /* Probe for the dbri chip and then attach the driver. */
static int __init dbri_init(void) static int __init dbri_init(void)
{ {
return of_register_platform_driver(&dbri_sbus_driver); return platform_driver_register(&dbri_sbus_driver);
} }
static void __exit dbri_exit(void) static void __exit dbri_exit(void)
{ {
of_unregister_platform_driver(&dbri_sbus_driver); platform_driver_unregister(&dbri_sbus_driver);
} }
module_init(dbri_init); module_init(dbri_init);