summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/can/dev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 9f58c4f0344d..7175b61cdc8b 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -99,8 +99,8 @@ can_update_sample_point(const struct can_bittiming_const *btc,
99 (tseg + CAN_CALC_SYNC_SEG); 99 (tseg + CAN_CALC_SYNC_SEG);
100 sample_point_error = abs(sample_point_nominal - sample_point); 100 sample_point_error = abs(sample_point_nominal - sample_point);
101 101
102 if ((sample_point <= sample_point_nominal) && 102 if (sample_point <= sample_point_nominal &&
103 (sample_point_error < best_sample_point_error)) { 103 sample_point_error < best_sample_point_error) {
104 best_sample_point = sample_point; 104 best_sample_point = sample_point;
105 best_sample_point_error = sample_point_error; 105 best_sample_point_error = sample_point_error;
106 *tseg1_ptr = tseg1; 106 *tseg1_ptr = tseg1;
@@ -151,7 +151,7 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt,
151 151
152 /* choose brp step which is possible in system */ 152 /* choose brp step which is possible in system */
153 brp = (brp / btc->brp_inc) * btc->brp_inc; 153 brp = (brp / btc->brp_inc) * btc->brp_inc;
154 if ((brp < btc->brp_min) || (brp > btc->brp_max)) 154 if (brp < btc->brp_min || brp > btc->brp_max)
155 continue; 155 continue;
156 156
157 bitrate = priv->clock.freq / (brp * tsegall); 157 bitrate = priv->clock.freq / (brp * tsegall);
@@ -803,7 +803,7 @@ int open_candev(struct net_device *dev)
803 /* For CAN FD the data bitrate has to be >= the arbitration bitrate */ 803 /* For CAN FD the data bitrate has to be >= the arbitration bitrate */
804 if ((priv->ctrlmode & CAN_CTRLMODE_FD) && 804 if ((priv->ctrlmode & CAN_CTRLMODE_FD) &&
805 (!priv->data_bittiming.bitrate || 805 (!priv->data_bittiming.bitrate ||
806 (priv->data_bittiming.bitrate < priv->bittiming.bitrate))) { 806 priv->data_bittiming.bitrate < priv->bittiming.bitrate)) {
807 netdev_err(dev, "incorrect/missing data bit-timing\n"); 807 netdev_err(dev, "incorrect/missing data bit-timing\n");
808 return -EINVAL; 808 return -EINVAL;
809 } 809 }
@@ -1253,7 +1253,7 @@ EXPORT_SYMBOL_GPL(unregister_candev);
1253 */ 1253 */
1254struct can_priv *safe_candev_priv(struct net_device *dev) 1254struct can_priv *safe_candev_priv(struct net_device *dev)
1255{ 1255{
1256 if ((dev->type != ARPHRD_CAN) || (dev->rtnl_link_ops != &can_link_ops)) 1256 if (dev->type != ARPHRD_CAN || dev->rtnl_link_ops != &can_link_ops)
1257 return NULL; 1257 return NULL;
1258 1258
1259 return netdev_priv(dev); 1259 return netdev_priv(dev);