Merge remote-tracking branch 'personal/v1.4.1' into v1.4.1

[librecmc/librecmc.git] / target / linux / generic / patches-4.4 / 042-0005-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch

diff --git a/target/linux/generic/patches-4.4/042-0005-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch b/target/linux/generic/patches-4.4/042-0005-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch
deleted file mode 100644 (file)
index a68eaa4..0000000
--- a/target/linux/generic/patches-4.4/042-0005-mtd-bcm47xxsflash-use-platform_-set-get-_drvdata.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From be5e5099183301fb7920f8f6b66bd3ac1f820a97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 16 Jan 2017 17:28:18 +0100
-Subject: [PATCH] mtd: bcm47xxsflash: use platform_(set|get)_drvdata
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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: Rafał Miłecki <rafal@milecki.pl>
-Acked-by: Kalle Valo <kvalo@codeaurora.org>
-Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
----
- drivers/mtd/devices/bcm47xxsflash.c         | 6 +++---
- include/linux/bcma/bcma_driver_chipcommon.h | 3 ---
- 2 files changed, 3 insertions(+), 6 deletions(-)
-
---- a/drivers/mtd/devices/bcm47xxsflash.c
-+++ b/drivers/mtd/devices/bcm47xxsflash.c
-@@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(stru
-       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(stru
-       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(stru
- 
- 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);
---- a/include/linux/bcma/bcma_driver_chipcommon.h
-+++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -591,9 +591,6 @@ struct bcma_sflash {
-       u32 blocksize;
-       u16 numblocks;
-       u32 size;
--
--      struct mtd_info *mtd;
--      void *priv;
- };
- #endif
-