aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Schütz <rschuetz@uni-koblenz.de>2017-10-29 08:03:22 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2017-11-10 03:15:28 -0500
commitfb5f0b3ef69b95e665e4bbe8a3de7201f09f1071 (patch)
tree1ff689df4f9cf44d86d309fe49df1f16c5a4f4d1
parent1cb483a5cc84b497afb51a6c5dfb5a38a0b67086 (diff)
can: c_can: don't indicate triple sampling support for D_CAN
The D_CAN controller doesn't provide a triple sampling mode, so don't set the CAN_CTRLMODE_3_SAMPLES flag in ctrlmode_supported. Currently enabling triple sampling is a no-op. Signed-off-by: Richard Schütz <rschuetz@uni-koblenz.de> Cc: linux-stable <stable@vger.kernel.org> # >= v3.6 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/can/c_can/c_can_pci.c1
-rw-r--r--drivers/net/can/c_can/c_can_platform.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c
index cf7c18947189..d065c0e2d18e 100644
--- a/drivers/net/can/c_can/c_can_pci.c
+++ b/drivers/net/can/c_can/c_can_pci.c
@@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev,
178 break; 178 break;
179 case BOSCH_D_CAN: 179 case BOSCH_D_CAN:
180 priv->regs = reg_map_d_can; 180 priv->regs = reg_map_d_can;
181 priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
182 break; 181 break;
183 default: 182 default:
184 ret = -EINVAL; 183 ret = -EINVAL;
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 46a746ee80bb..b5145a7f874c 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
320 break; 320 break;
321 case BOSCH_D_CAN: 321 case BOSCH_D_CAN:
322 priv->regs = reg_map_d_can; 322 priv->regs = reg_map_d_can;
323 priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
324 priv->read_reg = c_can_plat_read_reg_aligned_to_16bit; 323 priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
325 priv->write_reg = c_can_plat_write_reg_aligned_to_16bit; 324 priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
326 priv->read_reg32 = d_can_plat_read_reg32; 325 priv->read_reg32 = d_can_plat_read_reg32;