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

Commit be5e5099 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Brian Norris
Browse files

mtd: bcm47xxsflash: use platform_(set|get)_drvdata 



We have generic place & helpers for storing platform driver data so
there is no reason for using custom priv pointer.

This allows cleaning up struct bcma_sflash from unneeded fields.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 7a308bb3

drivers/mtd/devices/bcm47xxsflash.c

+3 −3
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) 
	b47s = devm_kzalloc(dev, sizeof(*b47s), GFP_KERNEL);

	if (!b47s)

		return -ENOMEM;

	sflash->priv = b47s;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {
@@ -334,6 +333,8 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) 
	b47s->size = sflash->size;

	bcm47xxsflash_fill_mtd(b47s, &pdev->dev);



	platform_set_drvdata(pdev, b47s);



	err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0);

	if (err) {

		pr_err("Failed to register MTD device: %d\n", err);
@@ -349,8 +350,7 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) 


static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)

{

	struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);

	struct bcm47xxsflash *b47s = sflash->priv;

	struct bcm47xxsflash *b47s = platform_get_drvdata(pdev);



	mtd_device_unregister(&b47s->mtd);

	iounmap(b47s->window);

include/linux/bcma/bcma_driver_chipcommon.h

+0 −3
Original line number Diff line number Diff line
@@ -593,9 +593,6 @@ struct bcma_sflash { 
	u32 blocksize;

	u16 numblocks;

	u32 size;



	struct mtd_info *mtd;

	void *priv;

};

#endif