Commit c9063a02 authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Herbert Xu
Browse files

crypto: atmel-{aes,sha,tdes} - Drop superfluous error message in probe() 



In case the probe fails, the device/driver core takes care of printing
the driver name, device name and error code. Drop superfluous error message
at probe.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0efe58f3

drivers/crypto/atmel-aes.c

+4 −11
Original line number Diff line number Diff line
@@ -2595,17 +2595,13 @@ static int atmel_aes_probe(struct platform_device *pdev) 
	pdata = pdev->dev.platform_data;

	if (!pdata) {

		pdata = atmel_aes_of_init(pdev);

		if (IS_ERR(pdata)) {

			err = PTR_ERR(pdata);

			goto aes_dd_err;

		}

		if (IS_ERR(pdata))

			return PTR_ERR(pdata);

	}



	aes_dd = devm_kzalloc(&pdev->dev, sizeof(*aes_dd), GFP_KERNEL);

	if (aes_dd == NULL) {

		err = -ENOMEM;

		goto aes_dd_err;

	}

	if (!aes_dd)

		return -ENOMEM;



	aes_dd->dev = dev;
@@ -2711,9 +2707,6 @@ static int atmel_aes_probe(struct platform_device *pdev) 
res_err:

	tasklet_kill(&aes_dd->done_task);

	tasklet_kill(&aes_dd->queue_task);

aes_dd_err:

	if (err != -EPROBE_DEFER)

		dev_err(dev, "initialization failed.\n");



	return err;

}

drivers/crypto/atmel-sha.c

+2 −6
Original line number Diff line number Diff line
@@ -2734,10 +2734,8 @@ static int atmel_sha_probe(struct platform_device *pdev) 
	int err;



	sha_dd = devm_kzalloc(&pdev->dev, sizeof(*sha_dd), GFP_KERNEL);

	if (sha_dd == NULL) {

		err = -ENOMEM;

		goto sha_dd_err;

	}

	if (!sha_dd)

		return -ENOMEM;



	sha_dd->dev = dev;
@@ -2846,8 +2844,6 @@ static int atmel_sha_probe(struct platform_device *pdev) 
res_err:

	tasklet_kill(&sha_dd->queue_task);

	tasklet_kill(&sha_dd->done_task);

sha_dd_err:

	dev_err(dev, "initialization failed.\n");



	return err;

}

drivers/crypto/atmel-tdes.c

+2 −6
Original line number Diff line number Diff line
@@ -1240,10 +1240,8 @@ static int atmel_tdes_probe(struct platform_device *pdev) 
	int err;



	tdes_dd = devm_kmalloc(&pdev->dev, sizeof(*tdes_dd), GFP_KERNEL);

	if (tdes_dd == NULL) {

		err = -ENOMEM;

		goto tdes_dd_err;

	}

	if (!tdes_dd)

		return -ENOMEM;



	tdes_dd->dev = dev;
@@ -1352,8 +1350,6 @@ static int atmel_tdes_probe(struct platform_device *pdev) 
res_err:

	tasklet_kill(&tdes_dd->done_task);

	tasklet_kill(&tdes_dd->queue_task);

tdes_dd_err:

	dev_err(dev, "initialization failed.\n");



	return err;

}