spi/pl022: remove function cannot exit (50658b66) · Commits · 戴 / test

The remove function in the PL022 driver cannot abort the remove function any way, so restructure the code so as not to make that assumption. Remove will now proceed no matter whether it can stop the transfer queue or not. Reported-by:

Russell King <linux@arm.linux.org.uk> Signed-off-by:

Linus Walleij <linus.walleij@linaro.org> Signed-off-by:

Grant Likely <grant.likely@secretlab.ca>

drivers/spi/spi-pl022.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -2267,17 +2267,13 @@ static int __devexit
		pl022_remove(struct amba_device *adev)
		{
		struct pl022 *pl022 = amba_get_drvdata(adev);
		int status = 0;

		if (!pl022)
		return 0;

		/* Remove the queue */
		status = destroy_queue(pl022);
		if (status != 0) {
		dev_err(&adev->dev,
		"queue remove failed (%d)\n", status);
		return status;
		}
		if (destroy_queue(pl022) != 0)
		dev_err(&adev->dev, "queue remove failed\n");
		load_ssp_default_config(pl022);
		pl022_dma_remove(pl022);
		free_irq(adev->irq[0], pl022);
		@@ -2289,7 +2285,6 @@ pl022_remove(struct amba_device *adev)
		spi_unregister_master(pl022->master);
		spi_master_put(pl022->master);
		amba_set_drvdata(adev, NULL);
		dev_dbg(&adev->dev, "remove succeeded\n");
		return 0;
		}

Admin message