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

crypto: atmel-{aes,sha,tdes} - Retire crypto_platform_data 



These drivers no longer need it as they are only probed via DT.
crypto_platform_data was allocated but unused, so remove it.
This is a follow up for:
commit 45a536e3 ("crypto: atmel-tdes - Retire dma_request_slave_channel_compat()")
commit db28512f ("crypto: atmel-sha - Retire dma_request_slave_channel_compat()")
commit 62f72cbd ("crypto: atmel-aes - Retire dma_request_slave_channel_compat()")

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

drivers/crypto/atmel-aes.c

+1 −31
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/platform_device.h>



#include <linux/device.h>

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/interrupt.h>
@@ -37,7 +38,6 @@ 
#include <crypto/xts.h>

#include <crypto/internal/aead.h>

#include <crypto/internal/skcipher.h>

#include <linux/platform_data/crypto-atmel.h>

#include "atmel-aes-regs.h"

#include "atmel-authenc.h"
@@ -2479,45 +2479,15 @@ static const struct of_device_id atmel_aes_dt_ids[] = { 
	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, atmel_aes_dt_ids);



static struct crypto_platform_data *atmel_aes_of_init(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct crypto_platform_data *pdata;



	if (!np) {

		dev_err(&pdev->dev, "device node not found\n");

		return ERR_PTR(-EINVAL);

	}



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

	if (!pdata)

		return ERR_PTR(-ENOMEM);



	return pdata;

}

#else

static inline struct crypto_platform_data *atmel_aes_of_init(struct platform_device *pdev)

{

	return ERR_PTR(-EINVAL);

}

#endif



static int atmel_aes_probe(struct platform_device *pdev)

{

	struct atmel_aes_dev *aes_dd;

	struct crypto_platform_data *pdata;

	struct device *dev = &pdev->dev;

	struct resource *aes_res;

	int err;



	pdata = pdev->dev.platform_data;

	if (!pdata) {

		pdata = atmel_aes_of_init(pdev);

		if (IS_ERR(pdata))

			return PTR_ERR(pdata);

	}



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

	if (!aes_dd)

		return -ENOMEM;

drivers/crypto/atmel-sha.c

+1 −34
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/platform_device.h>



#include <linux/device.h>

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/interrupt.h>
@@ -36,7 +37,6 @@ 
#include <crypto/sha.h>

#include <crypto/hash.h>

#include <crypto/internal/hash.h>

#include <linux/platform_data/crypto-atmel.h>

#include "atmel-sha-regs.h"

#include "atmel-authenc.h"
@@ -2551,34 +2551,11 @@ static const struct of_device_id atmel_sha_dt_ids[] = { 
};



MODULE_DEVICE_TABLE(of, atmel_sha_dt_ids);



static struct crypto_platform_data *atmel_sha_of_init(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct crypto_platform_data *pdata;



	if (!np) {

		dev_err(&pdev->dev, "device node not found\n");

		return ERR_PTR(-EINVAL);

	}



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

	if (!pdata)

		return ERR_PTR(-ENOMEM);



	return pdata;

}

#else /* CONFIG_OF */

static inline struct crypto_platform_data *atmel_sha_of_init(struct platform_device *dev)

{

	return ERR_PTR(-EINVAL);

}

#endif



static int atmel_sha_probe(struct platform_device *pdev)

{

	struct atmel_sha_dev *sha_dd;

	struct crypto_platform_data	*pdata;

	struct device *dev = &pdev->dev;

	struct resource *sha_res;

	int err;
@@ -2650,16 +2627,6 @@ static int atmel_sha_probe(struct platform_device *pdev) 
	atmel_sha_get_cap(sha_dd);



	if (sha_dd->caps.has_dma) {

		pdata = pdev->dev.platform_data;

		if (!pdata) {

			pdata = atmel_sha_of_init(pdev);

			if (IS_ERR(pdata)) {

				dev_err(&pdev->dev, "platform data not available\n");

				err = PTR_ERR(pdata);

				goto err_iclk_unprepare;

			}

		}



		err = atmel_sha_dma_init(sha_dd);

		if (err)

			goto err_iclk_unprepare;

drivers/crypto/atmel-tdes.c

+1 −34
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/platform_device.h>



#include <linux/device.h>

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/interrupt.h>
@@ -34,7 +35,6 @@ 
#include <crypto/algapi.h>

#include <crypto/internal/des.h>

#include <crypto/internal/skcipher.h>

#include <linux/platform_data/crypto-atmel.h>

#include "atmel-tdes-regs.h"



#define ATMEL_TDES_PRIORITY	300
@@ -1157,34 +1157,11 @@ static const struct of_device_id atmel_tdes_dt_ids[] = { 
	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, atmel_tdes_dt_ids);



static struct crypto_platform_data *atmel_tdes_of_init(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct crypto_platform_data *pdata;



	if (!np) {

		dev_err(&pdev->dev, "device node not found\n");

		return ERR_PTR(-EINVAL);

	}



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

	if (!pdata)

		return ERR_PTR(-ENOMEM);



	return pdata;

}

#else /* CONFIG_OF */

static inline struct crypto_platform_data *atmel_tdes_of_init(struct platform_device *pdev)

{

	return ERR_PTR(-EINVAL);

}

#endif



static int atmel_tdes_probe(struct platform_device *pdev)

{

	struct atmel_tdes_dev *tdes_dd;

	struct crypto_platform_data	*pdata;

	struct device *dev = &pdev->dev;

	struct resource *tdes_res;

	int err;
@@ -1256,16 +1233,6 @@ static int atmel_tdes_probe(struct platform_device *pdev) 
		goto err_tasklet_kill;



	if (tdes_dd->caps.has_dma) {

		pdata = pdev->dev.platform_data;

		if (!pdata) {

			pdata = atmel_tdes_of_init(pdev);

			if (IS_ERR(pdata)) {

				dev_err(&pdev->dev, "platform data not available\n");

				err = PTR_ERR(pdata);

				goto err_buff_cleanup;

			}

		}



		err = atmel_tdes_dma_init(tdes_dd);

		if (err)

			goto err_buff_cleanup;

include/linux/platform_data/crypto-atmel.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __LINUX_CRYPTO_ATMEL_H

#define __LINUX_CRYPTO_ATMEL_H



#include <linux/platform_data/dma-atmel.h>



/**

 * struct crypto_dma_data - DMA data for AES/TDES/SHA

 */

struct crypto_dma_data {

	struct at_dma_slave	txdata;

	struct at_dma_slave	rxdata;

};



/**

 * struct crypto_platform_data - board-specific AES/TDES/SHA configuration

 * @dma_slave: DMA slave interface to use in data transfers.

 */

struct crypto_platform_data {

	struct crypto_dma_data	*dma_slave;

};



#endif /* __LINUX_CRYPTO_ATMEL_H */