aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-09-23 21:34:28 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-10-18 15:19:51 +0200
commitbeab675cb45f28a4a76780e43fd03e33bc773555 (patch)
tree14bba37566fd75bf4bd9a17e6cbbe76e59706603 /drivers/net
parentcan: mcp251x: Don't use pdata->model for chip selection anymore (diff)
downloadlinux-dev-beab675cb45f28a4a76780e43fd03e33bc773555.tar.xz
linux-dev-beab675cb45f28a4a76780e43fd03e33bc773555.zip
can: mcp251x: define helper functions mcp251x_is_2510, mcp251x_is_2515
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/mcp251x.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 0386bed43551..7f8aa4ce02c5 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -258,6 +258,16 @@ struct mcp251x_priv {
int restart_tx;
};
+#define MCP251X_IS(_model) \
+static inline int mcp251x_is_##_model(struct spi_device *spi) \
+{ \
+ struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); \
+ return priv->model == CAN_MCP251X_MCP##_model; \
+}
+
+MCP251X_IS(2510);
+MCP251X_IS(2515);
+
static void mcp251x_clean(struct net_device *net)
{
struct mcp251x_priv *priv = netdev_priv(net);
@@ -370,7 +380,7 @@ static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf,
{
struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
- if (priv->model == CAN_MCP251X_MCP2510) {
+ if (mcp251x_is_2510(spi)) {
int i;
for (i = 1; i < TXBDAT_OFF + len; i++)
@@ -414,7 +424,7 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
{
struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
- if (priv->model == CAN_MCP251X_MCP2510) {
+ if (mcp251x_is_2510(spi)) {
int i, len;
for (i = 1; i < RXBDAT_OFF; i++)