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.

Richard Schütz committed 9 years ago

Commit fb5f0b31 parent 1cb483a2 files · +0 −2Browse files

Unified · Split

2 files

drivers/net/can/c_can/c_can_pci.c +0 −1
drivers/net/can/c_can/c_can_platform.c +0 −1

drivers/net/can/c_can/c_can_pci.c+0−1

@@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev, · 177 unmodified lines
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;

drivers/net/can/c_can/c_can_platform.c+0−1

@@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev) · 319 unmodified lines
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;