spi: correct name for spi_txx9

Correct the name of the spi_txx9 driver (and their in-tree user)
instead of MODULE_ALIAS workaround.  This would be preferable in the
long term.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index 84ebff711e6ee294f84cbde0fb091c47a7fe3be1..f236b1ff89235bbe1e6adea98d54b133c7feffb0 100644 (file)
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -1108,7 +1108,7 @@ static void __init txx9_spi_init(unsigned long base, int irq)
                        .flags  = IORESOURCE_IRQ,
                },
        };
-       platform_device_register_simple("txx9spi", 0,
+       platform_device_register_simple("spi_txx9", 0,
                                        res, ARRAY_SIZE(res));
 }
 

diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index f6c3677035b0a65378f065192bae3fd3ff4adf7e..b7f4bb239eaf79e74dfede155474c43aac272795 100644 (file)
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -450,11 +450,10 @@ static int __exit txx9spi_remove(struct platform_device *dev)
        return 0;
 }
 
-MODULE_ALIAS("txx9spi");                       /* for platform bus hotplug */
 static struct platform_driver txx9spi_driver = {
        .remove = __exit_p(txx9spi_remove),
        .driver = {
-               .name = "txx9spi",
+               .name = "spi_txx9",
                .owner = THIS_MODULE,
        },
 };