Commit 5f1e83db authored by Luke-Jr's avatar Luke-Jr Committed by John W. Linville

p54spi: replace internal "cx3110x" name with "p54spi"

While the comment removed in this patch claims board_n800.c uses
"cx3110x", it was never merged to mainline like this.  Mainlined board
files for Nokia N8x0 devices are expected "p54spi", and thus don't
work because the modalias is "cx3110x".  To my knowledge, these
devices are the only real-world use of p54spi, and will not work
without this change.  Tested against my Nokia N810.
Signed-off-by: default avatarLuke Dashjr <luke-jr+git@utopios.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 38a6cc75
...@@ -697,9 +697,7 @@ static int __devexit p54spi_remove(struct spi_device *spi) ...@@ -697,9 +697,7 @@ static int __devexit p54spi_remove(struct spi_device *spi)
static struct spi_driver p54spi_driver = { static struct spi_driver p54spi_driver = {
.driver = { .driver = {
/* use cx3110x name because board-n800.c uses that for the .name = "p54spi",
* SPI port */
.name = "cx3110x",
.bus = &spi_bus_type, .bus = &spi_bus_type,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
...@@ -733,3 +731,4 @@ module_exit(p54spi_exit); ...@@ -733,3 +731,4 @@ module_exit(p54spi_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>"); MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>");
MODULE_ALIAS("spi:cx3110x"); MODULE_ALIAS("spi:cx3110x");
MODULE_ALIAS("spi:p54spi");
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