Merge remote-tracking branch 'spi/topic/pl022' into spi-devm (5afd077d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/spi/spi-pl022.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}