target/linux/brcm47xx/patches-3.8/033-mtd-bcm47xxsflash-adjust-names-of-bus-specific-funct.patch

   1 --- a/drivers/mtd/devices/bcm47xxsflash.c
   2 +++ b/drivers/mtd/devices/bcm47xxsflash.c
   3 @@ -44,7 +44,11 @@ static void bcm47xxsflash_fill_mtd(struc
   4         mtd->writebufsize = mtd->writesize = 1;
   5  }
   6
   7 -static int bcm47xxsflash_probe(struct platform_device *pdev)
   8 +/**************************************************
   9 + * BCMA
  10 + **************************************************/
  11 +
  12 +static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
  13  {
  14         struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
  15         struct bcm47xxsflash *b47s;
  16 @@ -77,7 +81,7 @@ out:
  17         return err;
  18  }
  19
  20 -static int bcm47xxsflash_remove(struct platform_device *pdev)
  21 +static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)
  22  {
  23         struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
  24         struct bcm47xxsflash *b47s = sflash->priv;
  25 @@ -89,14 +93,18 @@ static int bcm47xxsflash_remove(struct p
  26  }
  27
  28  static struct platform_driver bcma_sflash_driver = {
  29 -       .probe  = bcm47xxsflash_probe,
  30 -       .remove = bcm47xxsflash_remove,
  31 +       .probe  = bcm47xxsflash_bcma_probe,
  32 +       .remove = bcm47xxsflash_bcma_remove,
  33         .driver = {
  34                 .name = "bcma_sflash",
  35                 .owner = THIS_MODULE,
  36         },
  37  };
  38
  39 +/**************************************************
  40 + * Init
  41 + **************************************************/
  42 +
  43  static int __init bcm47xxsflash_init(void)
  44  {
  45         int err;