[ARM PATCH] 1954/2: Make pxa platform device names more sensible

Patch from Ian Campbell

Update 1954/1 to use pxa2xx- as the platform device prefix
instead of pxa2xx_. This changes pxamci to pxa2xx-mci, pxa2xx_udc
to pxa2xx-udc and pxafb to pxa2xx-fb. pxa2xx-uart doesn't need changing.

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 5f3f0d389c60c9ada6962a1f0b0b8331922e3029..80f3535e04e6c9a26a2e9dc020af0c5adc9fdecd 100644 (file)
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -118,7 +118,7 @@ static struct resource pxamci_resources[] = {
 static u64 pxamci_dmamask = 0xffffffffUL;
 
 static struct platform_device pxamci_device = {
-       .name           = "pxamci",
+       .name           = "pxa2xx-mci",
        .id             = -1,
        .dev            = {
                .dma_mask = &pxamci_dmamask,
@@ -153,7 +153,7 @@ static struct resource pxa2xx_udc_resources[] = {
 static u64 udc_dma_mask = ~(u32)0;
 
 static struct platform_device udc_device = {
-       .name           = "pxa2xx_udc",
+       .name           = "pxa2xx-udc",
        .id             = -1,
        .resource       = pxa2xx_udc_resources,
        .num_resources  = ARRAY_SIZE(pxa2xx_udc_resources),
@@ -187,7 +187,7 @@ static struct resource pxafb_resources[] = {
 static u64 fb_dma_mask = ~(u64)0;
 
 static struct platform_device pxafb_device = {
-       .name           = "pxafb",
+       .name           = "pxa2xx-fb",
        .id             = -1,
        .dev            = {
                .platform_data  = &pxa_fb_info,

diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index a74d64c00a9c95523ed10fe33b7a96c0a2eeca1d..63e538a57fffec34ad94237db063dc6ecc177fd4 100644 (file)
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2539,7 +2539,7 @@ static int __exit pxa2xx_udc_remove(struct device *_dev)
 /*-------------------------------------------------------------------------*/
 
 static struct device_driver udc_driver = {
-       .name           = (char *) driver_name,
+       .name           = "pxa2xx-udc",
        .bus            = &platform_bus_type,
        .probe          = pxa2xx_udc_probe,
        .remove         = __exit_p(pxa2xx_udc_remove),

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 05d8ad2a61c119a8d517201c2fee342ac48d1a3f..aaac77f2c7cd25cbdddd0657621dfbba70b80cb3 100644 (file)
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1350,7 +1350,7 @@ failed:
 }
 
 static struct device_driver pxafb_driver = {
-       .name           = "pxafb",
+       .name           = "pxa2xx-fb",
        .bus            = &platform_bus_type,
        .probe          = pxafb_probe,
 #ifdef CONFIG_PM