ARM: pxa: icontrol: Constify the software node

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / icontrol.c

diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index 151e26ec06968334e037d5bf389d7f12e4c1ce71..04a12523cdee0418e764027cb0cbc732fd594c20 100644 (file)
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -74,13 +74,17 @@ static const struct property_entry mcp251x_properties[] = {
        {}
 };
 
+static const struct software_node mcp251x_node = {
+       .properties = mcp251x_properties,
+};
+
 static struct spi_board_info mcp251x_board_info[] = {
        {
                .modalias        = "mcp2515",
                .max_speed_hz    = 6500000,
                .bus_num         = 3,
                .chip_select     = 0,
-               .properties      = mcp251x_properties,
+               .swnode          = &mcp251x_node,
                .controller_data = &mcp251x_chip_info1,
                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ1)
        },
@@ -89,7 +93,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                .max_speed_hz    = 6500000,
                .bus_num         = 3,
                .chip_select     = 1,
-               .properties      = mcp251x_properties,
+               .swnode          = &mcp251x_node,
                .controller_data = &mcp251x_chip_info2,
                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ2)
        },
@@ -98,7 +102,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                .max_speed_hz    = 6500000,
                .bus_num         = 4,
                .chip_select     = 0,
-               .properties      = mcp251x_properties,
+               .swnode          = &mcp251x_node,
                .controller_data = &mcp251x_chip_info3,
                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ3)
        },
@@ -107,7 +111,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                .max_speed_hz    = 6500000,
                .bus_num         = 4,
                .chip_select     = 1,
-               .properties      = mcp251x_properties,
+               .swnode          = &mcp251x_node,
                .controller_data = &mcp251x_chip_info4,
                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ4)
        }