diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-10-04 07:18:01 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-10-31 15:55:16 -0400 |
commit | 26896fd98130cdda73b19c75849a0d25cb850cb8 (patch) | |
tree | dd1cca0657f1b85fd88c0dc7a5db31a91e869224 /drivers/net/can | |
parent | 49cb5c0e0cb26e9f39445d8b5aa5c50ba9451cdd (diff) |
can: ti_hecc: remove priv->can.do_get_state() callback
This patch removes the priv->can.do_get_state() callback, as it just returns
priv->can.state. The callback's only user can_fill_info() has direct access to
priv->can.state.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r-- | drivers/net/can/ti_hecc.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index beb5ef834f0f..60d95b44d0f7 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c | |||
@@ -286,15 +286,6 @@ static inline u32 hecc_get_bit(struct ti_hecc_priv *priv, int reg, u32 bit_mask) | |||
286 | return (hecc_read(priv, reg) & bit_mask) ? 1 : 0; | 286 | return (hecc_read(priv, reg) & bit_mask) ? 1 : 0; |
287 | } | 287 | } |
288 | 288 | ||
289 | static int ti_hecc_get_state(const struct net_device *ndev, | ||
290 | enum can_state *state) | ||
291 | { | ||
292 | struct ti_hecc_priv *priv = netdev_priv(ndev); | ||
293 | |||
294 | *state = priv->can.state; | ||
295 | return 0; | ||
296 | } | ||
297 | |||
298 | static int ti_hecc_set_btc(struct ti_hecc_priv *priv) | 289 | static int ti_hecc_set_btc(struct ti_hecc_priv *priv) |
299 | { | 290 | { |
300 | struct can_bittiming *bit_timing = &priv->can.bittiming; | 291 | struct can_bittiming *bit_timing = &priv->can.bittiming; |
@@ -940,7 +931,6 @@ static int ti_hecc_probe(struct platform_device *pdev) | |||
940 | 931 | ||
941 | priv->can.bittiming_const = &ti_hecc_bittiming_const; | 932 | priv->can.bittiming_const = &ti_hecc_bittiming_const; |
942 | priv->can.do_set_mode = ti_hecc_do_set_mode; | 933 | priv->can.do_set_mode = ti_hecc_do_set_mode; |
943 | priv->can.do_get_state = ti_hecc_get_state; | ||
944 | priv->can.do_get_berr_counter = ti_hecc_get_berr_counter; | 934 | priv->can.do_get_berr_counter = ti_hecc_get_berr_counter; |
945 | priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES; | 935 | priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES; |
946 | 936 | ||