Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b2fe9b6 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

dmaengine: ste_dma40: Move rev error-check up to revision acquisition 



At the moment we fetch the hardware revision, then do some stuff, then
check whether the revision is correct and return in error if it's not.
Well we may as well check it as soon as we know what it is, so let's
move the check right up underneath where we acquire the version.

Acked-by: default avatarVinod Koul <vnod.koul@intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8a59fed3

drivers/dma/ste_dma40.c

+4 −6
Original line number Diff line number Diff line
@@ -3204,6 +3204,10 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev) 
	 * DB8540v1 has revision 4

	 */

	rev = AMBA_REV_BITS(pid);

	if (rev < 2) {

		d40_err(&pdev->dev, "hardware revision: %d is not supported", rev);

		goto failure;

	}



	plat_data = pdev->dev.platform_data;
@@ -3218,12 +3222,6 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev) 
	dev_info(&pdev->dev, "hardware revision: %d @ 0x%x with %d physical channels\n",

		 rev, res->start, num_phy_chans);



	if (rev < 2) {

		d40_err(&pdev->dev, "hardware revision: %d is not supported",

			rev);

		goto failure;

	}



	base = kzalloc(ALIGN(sizeof(struct d40_base), 4) +

		       (num_phy_chans + num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) *

		       sizeof(struct d40_chan), GFP_KERNEL);