diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-10-18 15:00:18 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-10-18 15:16:08 +0200 |
| commit | f1f8c6cbe6f08f93ac2a4ca19625891d8a82b7f8 (patch) | |
| tree | 0ed97a9e3ed0414f69a7ad65778ee4dbeb282642 /include/linux/can | |
| parent | d3cd15657516141adce387810be8cb377baf020e (diff) | |
| download | blackbird-op-linux-f1f8c6cbe6f08f93ac2a4ca19625891d8a82b7f8.tar.gz blackbird-op-linux-f1f8c6cbe6f08f93ac2a4ca19625891d8a82b7f8.zip | |
can: mcp251x: Don't use pdata->model for chip selection anymore
Since commit e446630c960946b5c1762e4eadb618becef599e7, i.e. v2.6.35-rc1,
the mcp251x chip model can be selected via the modalias member in the
struct spi_board_info. The driver stores the actual model in the
struct mcp251x_platform_data.
From the driver point of view the platform_data should be read only.
Since all in-tree users of the mcp251x have already been converted to
the modalias method, this patch moves the "model" member from the
struct mcp251x_platform_data to the driver's private data structure.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Christian Pellegrin <chripell@fsfe.org>
Cc: Marc Zyngier <maz@misterjones.org>
Diffstat (limited to 'include/linux/can')
| -rw-r--r-- | include/linux/can/platform/mcp251x.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h index dba28268e651..8e20540043f5 100644 --- a/include/linux/can/platform/mcp251x.h +++ b/include/linux/can/platform/mcp251x.h @@ -12,7 +12,6 @@ /** * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data * @oscillator_frequency: - oscillator frequency in Hz - * @model: - actual type of chip * @board_specific_setup: - called before probing the chip (power,reset) * @transceiver_enable: - called to power on/off the transceiver * @power_enable: - called to power on/off the mcp *and* the @@ -25,9 +24,6 @@ struct mcp251x_platform_data { unsigned long oscillator_frequency; - int model; -#define CAN_MCP251X_MCP2510 0x2510 -#define CAN_MCP251X_MCP2515 0x2515 int (*board_specific_setup)(struct spi_device *spi); int (*transceiver_enable)(int enable); int (*power_enable) (int enable); |
