Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 14
Star 1
Fork 0
R
raspberrypi-kernel
提交 5afd077d 编写于 作者: M Mark Brown
浏览文件
操作

Merge remote-tracking branch 'spi/topic/pl022' into spi-devm

上级 13e92b5b 4ebfee91
隐藏空白更改
内联 并排
Showing with 0 addition and 3 deletion
drivers/spi/spi-pl022.c
浏览文件 @ 5afd077d
...@@ -1619,7 +1619,6 @@ static int verify_controller_parameters(struct pl022 *pl022, ...@@ -1619,7 +1619,6 @@ static int verify_controller_parameters(struct pl022 *pl022,
dev_err(&pl022->adev->dev, dev_err(&pl022->adev->dev,
"RX FIFO Trigger Level is configured incorrectly\n"); "RX FIFO Trigger Level is configured incorrectly\n");
return -EINVAL; return -EINVAL;
break;
} }
switch (chip_info->tx_lev_trig) { switch (chip_info->tx_lev_trig) {
case SSP_TX_1_OR_MORE_EMPTY_LOC: case SSP_TX_1_OR_MORE_EMPTY_LOC:
...@@ -1645,7 +1644,6 @@ static int verify_controller_parameters(struct pl022 *pl022, ...@@ -1645,7 +1644,6 @@ static int verify_controller_parameters(struct pl022 *pl022,
dev_err(&pl022->adev->dev, dev_err(&pl022->adev->dev,
"TX FIFO Trigger Level is configured incorrectly\n"); "TX FIFO Trigger Level is configured incorrectly\n");
return -EINVAL; return -EINVAL;
break;
} }
if (chip_info->iface == SSP_INTERFACE_NATIONAL_MICROWIRE) { if (chip_info->iface == SSP_INTERFACE_NATIONAL_MICROWIRE) {
if ((chip_info->ctrl_len < SSP_BITS_4) if ((chip_info->ctrl_len < SSP_BITS_4)
...@@ -2288,7 +2286,6 @@ pl022_remove(struct amba_device *adev) ...@@ -2288,7 +2286,6 @@ pl022_remove(struct amba_device *adev)
amba_release_regions(adev); amba_release_regions(adev);
tasklet_disable(&pl022->pump_transfers); tasklet_disable(&pl022->pump_transfers);
spi_unregister_master(pl022->master); spi_unregister_master(pl022->master);
amba_set_drvdata(adev, NULL);
return 0; return 0;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或