Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/p54/p54spi.c

+2 −3
Original line number Diff line number Diff line
@@ -697,9 +697,7 @@ static int __devexit p54spi_remove(struct spi_device *spi) 


static struct spi_driver p54spi_driver = {

	.driver = {

		/* use cx3110x name because board-n800.c uses that for the

		 * SPI port */

		.name		= "cx3110x",

		.name		= "p54spi",

		.bus		= &spi_bus_type,

		.owner		= THIS_MODULE,

	},
@@ -733,3 +731,4 @@ module_exit(p54spi_exit); 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>");

MODULE_ALIAS("spi:cx3110x");

MODULE_ALIAS("spi:p54spi");