diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-26 11:41:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-26 11:41:15 +0100 |
| commit | 5afd077d70db464eb780732d40f5240c7dd679ba (patch) | |
| tree | 19abc098c952d0d13b76e98d39fdbcb79d08e913 | |
| parent | 13e92b5b1e8380997029d63fc7c85cdf18bdcf2b (diff) | |
| parent | 4ebfee9118599dece86429270be1bcbb3099f237 (diff) | |
Merge remote-tracking branch 'spi/topic/pl022' into spi-devm
| -rw-r--r-- | drivers/spi/spi-pl022.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 9c511a954d21..c13d523f1f48 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -1619,7 +1619,6 @@ static int verify_controller_parameters(struct pl022 *pl022, dev_err(&pl022->adev->dev, "RX FIFO Trigger Level is configured incorrectly\n"); return -EINVAL; - break; } switch (chip_info->tx_lev_trig) { case SSP_TX_1_OR_MORE_EMPTY_LOC: @@ -1645,7 +1644,6 @@ static int verify_controller_parameters(struct pl022 *pl022, dev_err(&pl022->adev->dev, "TX FIFO Trigger Level is configured incorrectly\n"); return -EINVAL; - break; } if (chip_info->iface == SSP_INTERFACE_NATIONAL_MICROWIRE) { if ((chip_info->ctrl_len < SSP_BITS_4) @@ -2288,7 +2286,6 @@ pl022_remove(struct amba_device *adev) amba_release_regions(adev); tasklet_disable(&pl022->pump_transfers); spi_unregister_master(pl022->master); - amba_set_drvdata(adev, NULL); return 0; } |