Add hotplug support to mcp251x driver

Chip model can now be selected directly by matching the modalias name
(instead of filling the .model field in platform_data), and allows the
module to be auto-loaded. Previous behaviour is of course still supported.

Convert the two in-tree users to this feature (icontrol & zeus).
Tested on an Zeus platform (mcp2515).

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Acked-by: Christian Pellegrin <chripell@fsfe.org>
Cc: Edwin Peer <epeer@tmtservices.co.za>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 5 insertions, 8 deletions

diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index 771137fc1a82..5ccb0ceff6c4 100644
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -73,7 +73,6 @@ static struct pxa2xx_spi_chip mcp251x_chip_info4 = {
 
 static struct mcp251x_platform_data mcp251x_info = {
         .oscillator_frequency = 16E6,
-        .model                = CAN_MCP251X_MCP2515,
         .board_specific_setup = NULL,
         .power_enable         = NULL,
         .transceiver_enable   = NULL
@@ -81,7 +80,7 @@ static struct mcp251x_platform_data mcp251x_info = {
 
 static struct spi_board_info mcp251x_board_info[] = {
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 3,
                 .chip_select     = 0,
@@ -90,7 +89,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ1)
         },
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 3,
                 .chip_select     = 1,
@@ -99,7 +98,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ2)
         },
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 4,
                 .chip_select     = 0,
@@ -108,7 +107,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ3)
         },
         {
-                .modalias        = "mcp251x",
+                .modalias        = "mcp2515",
                 .max_speed_hz    = 6500000,
                 .bus_num         = 4,
                 .chip_select     = 1,
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 39896d883584..dbd256966379 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -414,15 +414,13 @@ static int zeus_mcp2515_transceiver_enable(int enable)
 
 static struct mcp251x_platform_data zeus_mcp2515_pdata = {
         .oscillator_frequency   = 16*1000*1000,
-        .model                  = CAN_MCP251X_MCP2515,
         .board_specific_setup   = zeus_mcp2515_setup,
-        .transceiver_enable     = zeus_mcp2515_transceiver_enable,
         .power_enable           = zeus_mcp2515_transceiver_enable,
 };
 
 static struct spi_board_info zeus_spi_board_info[] = {
         [0] = {
-                .modalias       = "mcp251x",
+                .modalias       = "mcp2515",
                 .platform_data  = &zeus_mcp2515_pdata,
                 .irq            = gpio_to_irq(ZEUS_CAN_GPIO),
                 .max_speed_hz   = 1*1000*1000,