Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: maps: remove the now unused bcm963xx-flash

bcm963xx-flash does nothing meaningful anymore.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

authored by

Jonas Gorski and committed by
David Woodhouse
fa3ae714 f4aa7adb

-130
-10
drivers/mtd/maps/Kconfig
··· 242 242 help 243 243 Support for flash chips on NETtel/SecureEdge/SnapGear boards. 244 244 245 - config MTD_BCM963XX 246 - tristate "Map driver for Broadcom BCM963xx boards" 247 - depends on BCM63XX 248 - select MTD_MAP_BANK_WIDTH_2 249 - select MTD_CFI_I1 250 - select MTD_BCM63XX_PARTS 251 - help 252 - Support for parsing CFE image tag and creating MTD partitions on 253 - Broadcom BCM63xx boards. 254 - 255 245 config MTD_LANTIQ 256 246 tristate "Lantiq SoC NOR support" 257 247 depends on LANTIQ
-1
drivers/mtd/maps/Makefile
··· 55 55 obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o 56 56 obj-$(CONFIG_MTD_VMU) += vmu-flash.o 57 57 obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o 58 - obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o 59 58 obj-$(CONFIG_MTD_LATCH_ADDR) += latch-addr-flash.o 60 59 obj-$(CONFIG_MTD_LANTIQ) += lantiq-flash.o
-119
drivers/mtd/maps/bcm963xx-flash.c
··· 1 - /* 2 - * Copyright © 2006-2008 Florian Fainelli <florian@openwrt.org> 3 - * Mike Albon <malbon@openwrt.org> 4 - * Copyright © 2009-2010 Daniel Dickinson <openwrt@cshore.neomailbox.net> 5 - * 6 - * This program is free software; you can redistribute it and/or modify 7 - * it under the terms of the GNU General Public License as published by 8 - * the Free Software Foundation; either version 2 of the License, or 9 - * (at your option) any later version. 10 - * 11 - * This program is distributed in the hope that it will be useful, 12 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 - * GNU General Public License for more details. 15 - * 16 - * You should have received a copy of the GNU General Public License 17 - * along with this program; if not, write to the Free Software 18 - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 19 - */ 20 - 21 - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 22 - 23 - #include <linux/init.h> 24 - #include <linux/kernel.h> 25 - #include <linux/slab.h> 26 - #include <linux/module.h> 27 - #include <linux/mtd/map.h> 28 - #include <linux/mtd/mtd.h> 29 - #include <linux/mtd/partitions.h> 30 - #include <linux/platform_device.h> 31 - #include <linux/io.h> 32 - 33 - #define BCM63XX_BUSWIDTH 2 /* Buswidth */ 34 - 35 - static struct mtd_info *bcm963xx_mtd_info; 36 - 37 - static struct map_info bcm963xx_map = { 38 - .name = "bcm963xx", 39 - .bankwidth = BCM63XX_BUSWIDTH, 40 - }; 41 - 42 - static const char *part_types[] = { "bcm63xxpart", NULL }; 43 - 44 - static int bcm963xx_probe(struct platform_device *pdev) 45 - { 46 - int err = 0; 47 - struct resource *r; 48 - 49 - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 50 - if (!r) { 51 - dev_err(&pdev->dev, "no resource supplied\n"); 52 - return -ENODEV; 53 - } 54 - 55 - bcm963xx_map.phys = r->start; 56 - bcm963xx_map.size = resource_size(r); 57 - bcm963xx_map.virt = ioremap(r->start, resource_size(r)); 58 - if (!bcm963xx_map.virt) { 59 - dev_err(&pdev->dev, "failed to ioremap\n"); 60 - return -EIO; 61 - } 62 - 63 - dev_info(&pdev->dev, "0x%08lx at 0x%08x\n", 64 - bcm963xx_map.size, bcm963xx_map.phys); 65 - 66 - simple_map_init(&bcm963xx_map); 67 - 68 - bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map); 69 - if (!bcm963xx_mtd_info) { 70 - dev_err(&pdev->dev, "failed to probe using CFI\n"); 71 - bcm963xx_mtd_info = do_map_probe("jedec_probe", &bcm963xx_map); 72 - if (bcm963xx_mtd_info) 73 - goto probe_ok; 74 - dev_err(&pdev->dev, "failed to probe using JEDEC\n"); 75 - err = -EIO; 76 - goto err_probe; 77 - } 78 - 79 - probe_ok: 80 - bcm963xx_mtd_info->owner = THIS_MODULE; 81 - 82 - return mtd_device_parse_register(bcm963xx_mtd_info, part_types, NULL, 83 - NULL, 0); 84 - err_probe: 85 - iounmap(bcm963xx_map.virt); 86 - return err; 87 - } 88 - 89 - static int bcm963xx_remove(struct platform_device *pdev) 90 - { 91 - if (bcm963xx_mtd_info) { 92 - mtd_device_unregister(bcm963xx_mtd_info); 93 - map_destroy(bcm963xx_mtd_info); 94 - } 95 - 96 - if (bcm963xx_map.virt) { 97 - iounmap(bcm963xx_map.virt); 98 - bcm963xx_map.virt = 0; 99 - } 100 - 101 - return 0; 102 - } 103 - 104 - static struct platform_driver bcm63xx_mtd_dev = { 105 - .probe = bcm963xx_probe, 106 - .remove = bcm963xx_remove, 107 - .driver = { 108 - .name = "bcm963xx-flash", 109 - .owner = THIS_MODULE, 110 - }, 111 - }; 112 - 113 - module_platform_driver(bcm63xx_mtd_dev); 114 - 115 - MODULE_LICENSE("GPL"); 116 - MODULE_DESCRIPTION("Broadcom BCM63xx MTD driver for CFE and RedBoot"); 117 - MODULE_AUTHOR("Daniel Dickinson <openwrt@cshore.neomailbox.net>"); 118 - MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); 119 - MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");