Patchwork [V2] mtd: bcm47xxsflash: adjust names of bus-specific functions

login
register
mail settings
Submitter Rafał Miłecki
Date Feb. 4, 2013, 7:23 a.m.
Message ID <1359962588-25866-1-git-send-email-zajec5@gmail.com>
Download mbox | patch
Permalink /patch/217835/
State Accepted
Commit f1a7c9d350339e8a81cda9469ba9a591fb9c9a3b
Headers show

Comments

Rafał Miłecki - Feb. 4, 2013, 7:23 a.m.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
V2: rebased on top of
[PATCH 0/6] mtd: bcm47xx: some fixes for the flash drivers
(plus two extra comments)
---
 drivers/mtd/devices/bcm47xxsflash.c |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
Artem Bityutskiy - Feb. 4, 2013, 9:21 a.m.
On Mon, 2013-02-04 at 08:23 +0100, Rafał Miłecki wrote:
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

Pushed to l2-mtd.git, thanks!

Patch

diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c
index 729ca5f..9526628 100644
--- a/drivers/mtd/devices/bcm47xxsflash.c
+++ b/drivers/mtd/devices/bcm47xxsflash.c
@@ -44,7 +44,11 @@  static void bcm47xxsflash_fill_mtd(struct bcm47xxsflash *b47s)
 	mtd->writebufsize = mtd->writesize = 1;
 }
 
-static int bcm47xxsflash_probe(struct platform_device *pdev)
+/**************************************************
+ * BCMA
+ **************************************************/
+
+static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
 {
 	struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
 	struct bcm47xxsflash *b47s;
@@ -77,7 +81,7 @@  out:
 	return err;
 }
 
-static int bcm47xxsflash_remove(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;
@@ -89,14 +93,18 @@  static int bcm47xxsflash_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver bcma_sflash_driver = {
-	.probe	= bcm47xxsflash_probe,
-	.remove = bcm47xxsflash_remove,
+	.probe	= bcm47xxsflash_bcma_probe,
+	.remove = bcm47xxsflash_bcma_remove,
 	.driver = {
 		.name = "bcma_sflash",
 		.owner = THIS_MODULE,
 	},
 };
 
+/**************************************************
+ * Init
+ **************************************************/
+
 static int __init bcm47xxsflash_init(void)
 {
 	int err;