summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-pxa/ssp.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2010-05-05 10:11:15 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 17:25:06 +0200
commitbaffe1699c68da5040de6b274054adc995795782 (patch)
treecdb8a8b80ffb7d8d14b80305c38af650a9842abf /arch/arm/plat-pxa/ssp.c
parent2503991a56483dc8477a3c6ca86da253eb5f8af9 (diff)
downloadblackbird-op-linux-baffe1699c68da5040de6b274054adc995795782.tar.gz
blackbird-op-linux-baffe1699c68da5040de6b274054adc995795782.zip
[ARM] pxa: add namespace on ssp
In order to prevent code ambiguous, add namespace on functions in ssp driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/plat-pxa/ssp.c')
-rw-r--r--arch/arm/plat-pxa/ssp.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
index 52c07cc756d7..c6357e554aba 100644
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -37,7 +37,7 @@
static DEFINE_MUTEX(ssp_lock);
static LIST_HEAD(ssp_list);
-struct ssp_device *ssp_request(int port, const char *label)
+struct ssp_device *pxa_ssp_request(int port, const char *label)
{
struct ssp_device *ssp = NULL;
@@ -58,9 +58,9 @@ struct ssp_device *ssp_request(int port, const char *label)
return ssp;
}
-EXPORT_SYMBOL(ssp_request);
+EXPORT_SYMBOL(pxa_ssp_request);
-void ssp_free(struct ssp_device *ssp)
+void pxa_ssp_free(struct ssp_device *ssp)
{
mutex_lock(&ssp_lock);
if (ssp->use_count) {
@@ -70,9 +70,9 @@ void ssp_free(struct ssp_device *ssp)
dev_err(&ssp->pdev->dev, "device already free\n");
mutex_unlock(&ssp_lock);
}
-EXPORT_SYMBOL(ssp_free);
+EXPORT_SYMBOL(pxa_ssp_free);
-static int __devinit ssp_probe(struct platform_device *pdev)
+static int __devinit pxa_ssp_probe(struct platform_device *pdev)
{
const struct platform_device_id *id = platform_get_device_id(pdev);
struct resource *res;
@@ -164,7 +164,7 @@ err_free:
return ret;
}
-static int __devexit ssp_remove(struct platform_device *pdev)
+static int __devexit pxa_ssp_remove(struct platform_device *pdev)
{
struct resource *res;
struct ssp_device *ssp;
@@ -196,9 +196,9 @@ static const struct platform_device_id ssp_id_table[] = {
{ },
};
-static struct platform_driver ssp_driver = {
- .probe = ssp_probe,
- .remove = __devexit_p(ssp_remove),
+static struct platform_driver pxa_ssp_driver = {
+ .probe = pxa_ssp_probe,
+ .remove = __devexit_p(pxa_ssp_remove),
.driver = {
.owner = THIS_MODULE,
.name = "pxa2xx-ssp",
@@ -208,12 +208,12 @@ static struct platform_driver ssp_driver = {
static int __init pxa_ssp_init(void)
{
- return platform_driver_register(&ssp_driver);
+ return platform_driver_register(&pxa_ssp_driver);
}
static void __exit pxa_ssp_exit(void)
{
- platform_driver_unregister(&ssp_driver);
+ platform_driver_unregister(&pxa_ssp_driver);
}
arch_initcall(pxa_ssp_init);
OpenPOWER on IntegriCloud