diff for duplicates of <4CEA3EAE.4080700@bvs-tech.com> diff --git a/N1/4.hdr b/N1/4.hdr new file mode 100644 index 0000000..4b86001 --- /dev/null +++ b/N1/4.hdr @@ -0,0 +1,4 @@ +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline diff --git a/N1/4.txt b/N1/4.txt new file mode 100644 index 0000000..8133cf0 --- /dev/null +++ b/N1/4.txt @@ -0,0 +1,4 @@ +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index 9750100..7884982 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1328,5 +1328,11 @@ "url:http://www.bvs-tech.com\n" "version:2.1\n" end:vcard + "\01:4\0" + "b\0" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -b53d57a0e7b87c41ebb2154242468be6d70c4a2b2cfa071d22c39b5573218b47 +94af29bbb8e0c02e0ed1b854cb8329e7c3d426d2eb3db739d1eec608bfc1a496
diff --git a/a/1.txt b/N2/1.txt index 481fedb..961c77a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ Hello, As I discussed with Russell King on the list -linux-arm-kernel@lists.infradead.org, there is a problem with the double +linux-arm-kernel at lists.infradead.org, there is a problem with the double definition of 'struct flash_platform_data' that are incompatible: in arch/arm/include/asm/mach/flash.h: @@ -35,23 +35,39 @@ They make conflict when one has both spi flash and an other type of mtd flash on I suppose the ARM version has no reason not to be platform independent, but that is an other problem. I propose to rename SPI version of the structure as it is the younger and it is included in a less number of files. -The patch (already sent on linux-arm-kernel@lists.infradead.org) is in attachment. +The patch (already sent on linux-arm-kernel at lists.infradead.org) is in attachment. Best regards, Alexis RODET -Le 21/11/2010 05:47, Baruch Siach a écrit : +Le 21/11/2010 05:47, Baruch Siach a ?crit : > Hi Alexis, > > On Fri, Nov 19, 2010 at 06:23:09PM +0100, Alexis RODET wrote: >>> It would, however, be nice if _someone_ out there could produce a patch >> Here is the patch and here is the command line used for doing this: > You need to CC the MTD maintainer and mailing list (David Woodhouse -> <dwmw2@infradead.org>, and linux-mtd@lists.infradead.org respectively), and +> <dwmw2@infradead.org>, and linux-mtd at lists.infradead.org respectively), and > maybe also the SPI subsystem maintainers (David Brownell > <dbrownell@users.sourceforge.net>, Grant Likely <grant.likely@secretlab.ca>, -> spi-devel-general@lists.sourceforge.net). +> spi-devel-general at lists.sourceforge.net). > > baruch > + +-------------- next part -------------- +An embedded message was scrubbed... +From: Alexis RODET <alexis.rodet@bvs-tech.com> +Subject: [PATCH] Renaming 'struct flash_platform_data' into 'struct spi_flash_platform_data' + in include/linux/spi/flash.h +Date: Fri, 19 Nov 2010 18:23:09 +0100 +Size: 25208 +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101122/8f4f2919/attachment-0001.mht> +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: alexis_rodet.vcf +Type: text/x-vcard +Size: 315 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101122/8f4f2919/attachment-0001.vcf> diff --git a/a/2.1.hdr b/a/2.1.hdr deleted file mode 100644 index c0da56e..0000000 --- a/a/2.1.hdr +++ /dev/null @@ -1,12 +0,0 @@ -Message-ID: <4CE6B27D.2000909@bvs-tech.com> -Date: Fri, 19 Nov 2010 18:23:09 +0100 -From: Alexis RODET <alexis.rodet@bvs-tech.com> -User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Lightning/1.0b2 Thunderbird/3.1.6 -MIME-Version: 1.0 -To: linux-arm-kernel@lists.infradead.org -Subject: [PATCH] Renaming 'struct flash_platform_data' into 'struct spi_flash_platform_data' - in include/linux/spi/flash.h -References: <20101117160514.GA5308@n2100.arm.linux.org.uk> -In-Reply-To: <20101117160514.GA5308@n2100.arm.linux.org.uk> -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 7bit diff --git a/a/2.1.txt b/a/2.1.txt deleted file mode 100644 index b7a3cd5..0000000 --- a/a/2.1.txt +++ /dev/null @@ -1,612 +0,0 @@ -Hello, - -> It would, however, be nice if _someone_ out there could produce a patch -Here is the patch and here is the command line used for doing this: - -find . \( -name .git -prune -false -o -path \ -./include/linux/spi/flash.h \ -o \( -name \*.c -execdir grep -q \ -'#include <linux/spi/flash.h>' \{\} \; \) \) -execdir sed -i -e \ -'s/struct flash_platform_data/struct spi_flash_platform_data/' \ -\{\} \+ -execdir git add \{\} \+ -print - -I didn't test all compilations as I don't have blackfin compiler installed. -I compiled successfully for x86 with allyesconfig and for Freescale mx27 -with allmodconfig minus some incompatible drivers. - -Best regards, -Alexis RODET - ---- - arch/arm/mach-at91/board-cam60.c | 2 +- - arch/arm/mach-at91/board-ecbat91.c | 2 +- - arch/arm/mach-dove/dove-db-setup.c | 2 +- - arch/arm/mach-kirkwood/lacie_v2-common.c | 2 +- - arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +- - arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- - arch/arm/mach-kirkwood/t5325-setup.c | 2 +- - arch/arm/mach-kirkwood/tsx1x-common.c | 2 +- - arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +- - arch/arm/mach-w90x900/dev.c | 2 +- - arch/blackfin/mach-bf518/boards/ezbrd.c | 2 +- - arch/blackfin/mach-bf518/boards/tcm-bf518.c | 2 +- - arch/blackfin/mach-bf527/boards/ad7160eval.c | 2 +- - arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 +- - arch/blackfin/mach-bf527/boards/ezbrd.c | 2 +- - arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf527/boards/tll6527m.c | 2 +- - arch/blackfin/mach-bf533/boards/H8606.c | 2 +- - arch/blackfin/mach-bf533/boards/blackstamp.c | 2 +- - arch/blackfin/mach-bf533/boards/cm_bf533.c | 2 +- - arch/blackfin/mach-bf533/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf533/boards/stamp.c | 2 +- - arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +- - arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +- - arch/blackfin/mach-bf537/boards/minotaur.c | 2 +- - arch/blackfin/mach-bf537/boards/pnav10.c | 2 +- - arch/blackfin/mach-bf537/boards/stamp.c | 4 ++-- - arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +- - arch/blackfin/mach-bf538/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 +- - arch/blackfin/mach-bf548/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- - arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 +- - arch/mips/alchemy/devboards/db1200/platform.c | 2 +- - drivers/mtd/devices/m25p80.c | 2 +- - drivers/mtd/devices/mtd_dataflash.c | 2 +- - drivers/mtd/devices/sst25l.c | 2 +- - drivers/spi/spi_butterfly.c | 2 +- - include/linux/spi/flash.h | 4 ++-- - 39 files changed, 41 insertions(+), 41 deletions(-) - -diff --git a/arch/arm/mach-at91/board-cam60.c -b/arch/arm/mach-at91/board-cam60.c -index b54e3e6..50780b2 100644 ---- a/arch/arm/mach-at91/board-cam60.c -+++ b/arch/arm/mach-at91/board-cam60.c -@@ -98,7 +98,7 @@ static struct mtd_partition cam60_spi_partitions[] = { - }, - }; - -static struct flash_platform_data cam60_spi_flash_platform_data = { -+static struct spi_flash_platform_data cam60_spi_flash_platform_data = { - .name = "spi_flash", - .parts = cam60_spi_partitions, - .nr_parts = ARRAY_SIZE(cam60_spi_partitions) -diff --git a/arch/arm/mach-at91/board-ecbat91.c -b/arch/arm/mach-at91/board-ecbat91.c -index 7b58c94..8598237 100644 ---- a/arch/arm/mach-at91/board-ecbat91.c -+++ b/arch/arm/mach-at91/board-ecbat91.c -@@ -110,7 +110,7 @@ static struct mtd_partition __initdata -my_flash0_partitions[] = - } - }; - -static struct flash_platform_data __initdata my_flash0_platform = { -+static struct spi_flash_platform_data __initdata my_flash0_platform = { - .name = "Removable flash card", - .parts = my_flash0_partitions, - .nr_parts = ARRAY_SIZE(my_flash0_partitions) -diff --git a/arch/arm/mach-dove/dove-db-setup.c -b/arch/arm/mach-dove/dove-db-setup.c -index 95925aa..90f8f95 100644 ---- a/arch/arm/mach-dove/dove-db-setup.c -+++ b/arch/arm/mach-dove/dove-db-setup.c -@@ -40,7 +40,7 @@ static struct mv_sata_platform_data dove_db_sata_data = { - * SPI Devices: - * SPI0: 4M Flash ST-M25P32-VMF6P - -****************************************************************************/ --static const struct flash_platform_data dove_db_spi_flash_data = { -+static const struct spi_flash_platform_data dove_db_spi_flash_data = { - .type = "m25p64", - }; - diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c -b/arch/arm/mach-kirkwood/lacie_v2-common.c -index 285edab..b60003f 100644 ---- a/arch/arm/mach-kirkwood/lacie_v2-common.c -+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c -@@ -33,7 +33,7 @@ static struct mtd_partition lacie_v2_flash_parts[] = { - }, - }; - -static const struct flash_platform_data lacie_v2_flash = { -+static const struct spi_flash_platform_data lacie_v2_flash = { - .type = "mx25l4005a", - .name = "spi_flash", - .parts = lacie_v2_flash_parts, -diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -index 1e5266f..16356c8 100644 ---- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -@@ -52,7 +52,7 @@ static struct dsa_platform_data -mv88f6281gtw_ge_switch_plat_data = { - .chip = &mv88f6281gtw_ge_switch_chip_data, - }; - -static const struct flash_platform_data mv88f6281gtw_ge_spi_slave_data = { -+static const struct spi_flash_platform_data -mv88f6281gtw_ge_spi_slave_data = { - .type = "mx25l12805d", - }; - diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -index 0049614..d3b706f 100644 ---- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -@@ -32,7 +32,7 @@ static struct mv_sata_platform_data -rd88f6192_sata_data = { - .n_ports = 2, - }; - -static const struct flash_platform_data rd88F6192_spi_slave_data = { -+static const struct spi_flash_platform_data rd88F6192_spi_slave_data = { - .type = "m25p128", - }; - diff --git a/arch/arm/mach-kirkwood/t5325-setup.c -b/arch/arm/mach-kirkwood/t5325-setup.c -index ce50e61..d086983 100644 ---- a/arch/arm/mach-kirkwood/t5325-setup.c -+++ b/arch/arm/mach-kirkwood/t5325-setup.c -@@ -59,7 +59,7 @@ struct mtd_partition hp_t5325_partitions[] = { - }, - }; - -const struct flash_platform_data hp_t5325_flash = { -+const struct spi_flash_platform_data hp_t5325_flash = { - .type = "mx25l8005", - .name = "spi_flash", - .parts = hp_t5325_partitions, -diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c -b/arch/arm/mach-kirkwood/tsx1x-common.c -index f781164..14c7825 100644 ---- a/arch/arm/mach-kirkwood/tsx1x-common.c -+++ b/arch/arm/mach-kirkwood/tsx1x-common.c -@@ -59,7 +59,7 @@ struct mtd_partition qnap_tsx1x_partitions[] = { - }, - }; - -const struct flash_platform_data qnap_tsx1x_flash = { -+const struct spi_flash_platform_data qnap_tsx1x_flash = { - .type = "m25p128", - .name = "spi_flash", - .parts = qnap_tsx1x_partitions, -diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -index 02ff45f..b18bb24 100644 ---- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -@@ -65,7 +65,7 @@ static struct mtd_partition -rd88f6183ap_ge_partitions[] = { - }, - }; - -static struct flash_platform_data rd88f6183ap_ge_spi_slave_data = { -+static struct spi_flash_platform_data rd88f6183ap_ge_spi_slave_data = { - .type = "m25p64", - .nr_parts = ARRAY_SIZE(rd88f6183ap_ge_partitions), - .parts = rd88f6183ap_ge_partitions, -diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c -index 7a1fa6a..12d7f7c 100644 ---- a/arch/arm/mach-w90x900/dev.c -+++ b/arch/arm/mach-w90x900/dev.c -@@ -246,7 +246,7 @@ static struct mtd_partition -nuc900_spi_flash_partitions[] = { - }, - }; - -static struct flash_platform_data nuc900_spi_flash_data = { -+static struct spi_flash_platform_data nuc900_spi_flash_data = { - .name = "m25p80", - .parts = nuc900_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(nuc900_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c -b/arch/blackfin/mach-bf518/boards/ezbrd.c -index b894c8a..ded02c1 100644 ---- a/arch/blackfin/mach-bf518/boards/ezbrd.c -+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c -@@ -178,7 +178,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c -b/arch/blackfin/mach-bf518/boards/tcm-bf518.c -index e6ce1d7..66817b0 100644 ---- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c -+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c -@@ -128,7 +128,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c -b/arch/blackfin/mach-bf527/boards/ad7160eval.c -index fc767ac..c43724b 100644 ---- a/arch/blackfin/mach-bf527/boards/ad7160eval.c -+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c -@@ -254,7 +254,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c -b/arch/blackfin/mach-bf527/boards/cm_bf527.c -index 2c31af7..3d5a3dc 100644 ---- a/arch/blackfin/mach-bf527/boards/cm_bf527.c -+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c -@@ -341,7 +341,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c -b/arch/blackfin/mach-bf527/boards/ezbrd.c -index 9a736a8..6670939 100644 ---- a/arch/blackfin/mach-bf527/boards/ezbrd.c -+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c -@@ -240,7 +240,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c -b/arch/blackfin/mach-bf527/boards/ezkit.c -index 9222bc0..78a07e7 100644 ---- a/arch/blackfin/mach-bf527/boards/ezkit.c -+++ b/arch/blackfin/mach-bf527/boards/ezkit.c -@@ -434,7 +434,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c -b/arch/blackfin/mach-bf527/boards/tll6527m.c -index 9ec5757..147374b 100644 ---- a/arch/blackfin/mach-bf527/boards/tll6527m.c -+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c -@@ -304,7 +304,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/H8606.c -b/arch/blackfin/mach-bf533/boards/H8606.c -index 2ce7b16..60ff37f 100644 ---- a/arch/blackfin/mach-bf533/boards/H8606.c -+++ b/arch/blackfin/mach-bf533/boards/H8606.c -@@ -149,7 +149,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c -b/arch/blackfin/mach-bf533/boards/blackstamp.c -index 20c1022..cbdcca1 100644 ---- a/arch/blackfin/mach-bf533/boards/blackstamp.c -+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c -@@ -93,7 +93,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c -b/arch/blackfin/mach-bf533/boards/cm_bf533.c -index adbe62a..6448686 100644 ---- a/arch/blackfin/mach-bf533/boards/cm_bf533.c -+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c -@@ -49,7 +49,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c -b/arch/blackfin/mach-bf533/boards/ezkit.c -index a1cb8e7..4e1ee73 100644 ---- a/arch/blackfin/mach-bf533/boards/ezkit.c -+++ b/arch/blackfin/mach-bf533/boards/ezkit.c -@@ -200,7 +200,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/stamp.c -b/arch/blackfin/mach-bf533/boards/stamp.c -index b3b1cde..8554b38 100644 ---- a/arch/blackfin/mach-bf533/boards/stamp.c -+++ b/arch/blackfin/mach-bf533/boards/stamp.c -@@ -163,7 +163,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c -b/arch/blackfin/mach-bf537/boards/cm_bf537e.c -index 836698c..c1bb193 100644 ---- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c -+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c -@@ -51,7 +51,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c -b/arch/blackfin/mach-bf537/boards/cm_bf537u.c -index 2a85670..da1886e 100644 ---- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c -+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c -@@ -52,7 +52,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c -b/arch/blackfin/mach-bf537/boards/minotaur.c -index 4980051..c360f10 100644 ---- a/arch/blackfin/mach-bf537/boards/minotaur.c -+++ b/arch/blackfin/mach-bf537/boards/minotaur.c -@@ -149,7 +149,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c -b/arch/blackfin/mach-bf537/boards/pnav10.c -index b958078..aab7edd 100644 ---- a/arch/blackfin/mach-bf537/boards/pnav10.c -+++ b/arch/blackfin/mach-bf537/boards/pnav10.c -@@ -174,7 +174,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/stamp.c -b/arch/blackfin/mach-bf537/boards/stamp.c -index 3aa344c..633cbf0 100644 ---- a/arch/blackfin/mach-bf537/boards/stamp.c -+++ b/arch/blackfin/mach-bf537/boards/stamp.c -@@ -526,7 +526,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -@@ -1003,7 +1003,7 @@ static struct mtd_partition -bfin_spi_dataflash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_dataflash_data = { -+static struct spi_flash_platform_data bfin_spi_dataflash_data = { - .name = "SPI Dataflash", - .parts = bfin_spi_dataflash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c -b/arch/blackfin/mach-bf537/boards/tcm_bf537.c -index 31498ad..557747f 100644 ---- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c -+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c -@@ -52,7 +52,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c -b/arch/blackfin/mach-bf538/boards/ezkit.c -index c6fb0a5..de9ab68 100644 ---- a/arch/blackfin/mach-bf538/boards/ezkit.c -+++ b/arch/blackfin/mach-bf538/boards/ezkit.c -@@ -493,7 +493,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c -b/arch/blackfin/mach-bf548/boards/cm_bf548.c -index f0c0eef..7effe25 100644 ---- a/arch/blackfin/mach-bf548/boards/cm_bf548.c -+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c -@@ -849,7 +849,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c -b/arch/blackfin/mach-bf548/boards/ezkit.c -index 216e269..1ab35e3 100644 ---- a/arch/blackfin/mach-bf548/boards/ezkit.c -+++ b/arch/blackfin/mach-bf548/boards/ezkit.c -@@ -957,7 +957,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c -b/arch/blackfin/mach-bf561/boards/acvilon.c -index 0b1c20f..7f69032 100644 ---- a/arch/blackfin/mach-bf561/boards/acvilon.c -+++ b/arch/blackfin/mach-bf561/boards/acvilon.c -@@ -359,7 +359,7 @@ static struct mtd_partition -bfin_spi_dataflash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_dataflash_data = { -+static struct spi_flash_platform_data bfin_spi_dataflash_data = { - .name = "SPI Dataflash", - .parts = bfin_spi_dataflash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions), -diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c -b/arch/blackfin/mach-bf561/boards/cm_bf561.c -index 087b6b0..80073ac 100644 ---- a/arch/blackfin/mach-bf561/boards/cm_bf561.c -+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c -@@ -50,7 +50,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/mips/alchemy/devboards/db1200/platform.c -b/arch/mips/alchemy/devboards/db1200/platform.c -index fbb5593..ea9bf90 100644 ---- a/arch/mips/alchemy/devboards/db1200/platform.c -+++ b/arch/mips/alchemy/devboards/db1200/platform.c -@@ -50,7 +50,7 @@ static struct mtd_partition db1200_spiflash_parts[] = { - }, - }; - -static struct flash_platform_data db1200_spiflash_data = { -+static struct spi_flash_platform_data db1200_spiflash_data = { - .name = "s25fl001", - .parts = db1200_spiflash_parts, - .nr_parts = ARRAY_SIZE(db1200_spiflash_parts), -diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c -index bf5a002..4244468 100644 ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -776,7 +776,7 @@ static const struct spi_device_id *__devinit -jedec_probe(struct spi_device *spi) - static int __devinit m25p_probe(struct spi_device *spi) - { - const struct spi_device_id *id = spi_get_device_id(spi); -- struct flash_platform_data *data; -+ struct spi_flash_platform_data *data; - struct m25p *flash; - struct flash_info *info; - unsigned i; -diff --git a/drivers/mtd/devices/mtd_dataflash.c -b/drivers/mtd/devices/mtd_dataflash.c -index c5015cc..9cb2727 100644 ---- a/drivers/mtd/devices/mtd_dataflash.c -+++ b/drivers/mtd/devices/mtd_dataflash.c -@@ -634,7 +634,7 @@ add_dataflash_otp(struct spi_device *spi, char *name, - { - struct dataflash *priv; - struct mtd_info *device; -- struct flash_platform_data *pdata = spi->dev.platform_data; -+ struct spi_flash_platform_data *pdata = spi->dev.platform_data; - char *otp_tag = ""; - int err = 0; - diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c -index 684247a..989758d 100644 ---- a/drivers/mtd/devices/sst25l.c -+++ b/drivers/mtd/devices/sst25l.c -@@ -379,7 +379,7 @@ static int __init sst25l_probe(struct spi_device *spi) - { - struct flash_info *flash_info; - struct sst25l_flash *flash; -- struct flash_platform_data *data; -+ struct spi_flash_platform_data *data; - int ret, i; - flash_info = sst25l_match_device(spi); -diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c -index 0d4ceba..a9ac6b2 100644 ---- a/drivers/spi/spi_butterfly.c -+++ b/drivers/spi/spi_butterfly.c -@@ -183,7 +183,7 @@ static struct mtd_partition partitions[] = { { - .size = MTDPART_SIZ_FULL, - } }; - -static struct flash_platform_data flash = { -+static struct spi_flash_platform_data flash = { - .name = "butterflash", - .parts = partitions, - .nr_parts = ARRAY_SIZE(partitions), -diff --git a/include/linux/spi/flash.h b/include/linux/spi/flash.h -index 3f22932..946145e 100644 ---- a/include/linux/spi/flash.h -+++ b/include/linux/spi/flash.h -@@ -4,7 +4,7 @@ - struct mtd_partition; - /** -- * struct flash_platform_data: board-specific flash data -+ * struct spi_flash_platform_data: board-specific flash data - * @name: optional flash device name (eg, as used with mtdparts=) - * @parts: optional array of mtd_partitions for static partitioning - * @nr_parts: number of mtd_partitions for static partitoning -@@ -18,7 +18,7 @@ struct mtd_partition; - * Note that for DataFlash, sizes for pages, blocks, and sectors are - * rarely powers of two; and partitions should be sector-aligned. - */ --struct flash_platform_data { -+struct spi_flash_platform_data { - char *name; - struct mtd_partition *parts; - unsigned int nr_parts; --- -1.7.1 diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index 02e096b..0000000 --- a/a/2.bin +++ /dev/null @@ -1,625 +0,0 @@ -Message-ID: <4CE6B27D.2000909@bvs-tech.com> -Date: Fri, 19 Nov 2010 18:23:09 +0100 -From: Alexis RODET <alexis.rodet@bvs-tech.com> -User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Lightning/1.0b2 Thunderbird/3.1.6 -MIME-Version: 1.0 -To: linux-arm-kernel@lists.infradead.org -Subject: [PATCH] Renaming 'struct flash_platform_data' into 'struct spi_flash_platform_data' - in include/linux/spi/flash.h -References: <20101117160514.GA5308@n2100.arm.linux.org.uk> -In-Reply-To: <20101117160514.GA5308@n2100.arm.linux.org.uk> -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 7bit - -Hello, - -> It would, however, be nice if _someone_ out there could produce a patch -Here is the patch and here is the command line used for doing this: - -find . \( -name .git -prune -false -o -path \ -./include/linux/spi/flash.h \ -o \( -name \*.c -execdir grep -q \ -'#include <linux/spi/flash.h>' \{\} \; \) \) -execdir sed -i -e \ -'s/struct flash_platform_data/struct spi_flash_platform_data/' \ -\{\} \+ -execdir git add \{\} \+ -print - -I didn't test all compilations as I don't have blackfin compiler installed. -I compiled successfully for x86 with allyesconfig and for Freescale mx27 -with allmodconfig minus some incompatible drivers. - -Best regards, -Alexis RODET - ---- - arch/arm/mach-at91/board-cam60.c | 2 +- - arch/arm/mach-at91/board-ecbat91.c | 2 +- - arch/arm/mach-dove/dove-db-setup.c | 2 +- - arch/arm/mach-kirkwood/lacie_v2-common.c | 2 +- - arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +- - arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- - arch/arm/mach-kirkwood/t5325-setup.c | 2 +- - arch/arm/mach-kirkwood/tsx1x-common.c | 2 +- - arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +- - arch/arm/mach-w90x900/dev.c | 2 +- - arch/blackfin/mach-bf518/boards/ezbrd.c | 2 +- - arch/blackfin/mach-bf518/boards/tcm-bf518.c | 2 +- - arch/blackfin/mach-bf527/boards/ad7160eval.c | 2 +- - arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 +- - arch/blackfin/mach-bf527/boards/ezbrd.c | 2 +- - arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf527/boards/tll6527m.c | 2 +- - arch/blackfin/mach-bf533/boards/H8606.c | 2 +- - arch/blackfin/mach-bf533/boards/blackstamp.c | 2 +- - arch/blackfin/mach-bf533/boards/cm_bf533.c | 2 +- - arch/blackfin/mach-bf533/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf533/boards/stamp.c | 2 +- - arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +- - arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +- - arch/blackfin/mach-bf537/boards/minotaur.c | 2 +- - arch/blackfin/mach-bf537/boards/pnav10.c | 2 +- - arch/blackfin/mach-bf537/boards/stamp.c | 4 ++-- - arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +- - arch/blackfin/mach-bf538/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 +- - arch/blackfin/mach-bf548/boards/ezkit.c | 2 +- - arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- - arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 +- - arch/mips/alchemy/devboards/db1200/platform.c | 2 +- - drivers/mtd/devices/m25p80.c | 2 +- - drivers/mtd/devices/mtd_dataflash.c | 2 +- - drivers/mtd/devices/sst25l.c | 2 +- - drivers/spi/spi_butterfly.c | 2 +- - include/linux/spi/flash.h | 4 ++-- - 39 files changed, 41 insertions(+), 41 deletions(-) - -diff --git a/arch/arm/mach-at91/board-cam60.c -b/arch/arm/mach-at91/board-cam60.c -index b54e3e6..50780b2 100644 ---- a/arch/arm/mach-at91/board-cam60.c -+++ b/arch/arm/mach-at91/board-cam60.c -@@ -98,7 +98,7 @@ static struct mtd_partition cam60_spi_partitions[] = { - }, - }; - -static struct flash_platform_data cam60_spi_flash_platform_data = { -+static struct spi_flash_platform_data cam60_spi_flash_platform_data = { - .name = "spi_flash", - .parts = cam60_spi_partitions, - .nr_parts = ARRAY_SIZE(cam60_spi_partitions) -diff --git a/arch/arm/mach-at91/board-ecbat91.c -b/arch/arm/mach-at91/board-ecbat91.c -index 7b58c94..8598237 100644 ---- a/arch/arm/mach-at91/board-ecbat91.c -+++ b/arch/arm/mach-at91/board-ecbat91.c -@@ -110,7 +110,7 @@ static struct mtd_partition __initdata -my_flash0_partitions[] = - } - }; - -static struct flash_platform_data __initdata my_flash0_platform = { -+static struct spi_flash_platform_data __initdata my_flash0_platform = { - .name = "Removable flash card", - .parts = my_flash0_partitions, - .nr_parts = ARRAY_SIZE(my_flash0_partitions) -diff --git a/arch/arm/mach-dove/dove-db-setup.c -b/arch/arm/mach-dove/dove-db-setup.c -index 95925aa..90f8f95 100644 ---- a/arch/arm/mach-dove/dove-db-setup.c -+++ b/arch/arm/mach-dove/dove-db-setup.c -@@ -40,7 +40,7 @@ static struct mv_sata_platform_data dove_db_sata_data = { - * SPI Devices: - * SPI0: 4M Flash ST-M25P32-VMF6P - -****************************************************************************/ --static const struct flash_platform_data dove_db_spi_flash_data = { -+static const struct spi_flash_platform_data dove_db_spi_flash_data = { - .type = "m25p64", - }; - diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c -b/arch/arm/mach-kirkwood/lacie_v2-common.c -index 285edab..b60003f 100644 ---- a/arch/arm/mach-kirkwood/lacie_v2-common.c -+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c -@@ -33,7 +33,7 @@ static struct mtd_partition lacie_v2_flash_parts[] = { - }, - }; - -static const struct flash_platform_data lacie_v2_flash = { -+static const struct spi_flash_platform_data lacie_v2_flash = { - .type = "mx25l4005a", - .name = "spi_flash", - .parts = lacie_v2_flash_parts, -diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -index 1e5266f..16356c8 100644 ---- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c -@@ -52,7 +52,7 @@ static struct dsa_platform_data -mv88f6281gtw_ge_switch_plat_data = { - .chip = &mv88f6281gtw_ge_switch_chip_data, - }; - -static const struct flash_platform_data mv88f6281gtw_ge_spi_slave_data = { -+static const struct spi_flash_platform_data -mv88f6281gtw_ge_spi_slave_data = { - .type = "mx25l12805d", - }; - diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -index 0049614..d3b706f 100644 ---- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c -@@ -32,7 +32,7 @@ static struct mv_sata_platform_data -rd88f6192_sata_data = { - .n_ports = 2, - }; - -static const struct flash_platform_data rd88F6192_spi_slave_data = { -+static const struct spi_flash_platform_data rd88F6192_spi_slave_data = { - .type = "m25p128", - }; - diff --git a/arch/arm/mach-kirkwood/t5325-setup.c -b/arch/arm/mach-kirkwood/t5325-setup.c -index ce50e61..d086983 100644 ---- a/arch/arm/mach-kirkwood/t5325-setup.c -+++ b/arch/arm/mach-kirkwood/t5325-setup.c -@@ -59,7 +59,7 @@ struct mtd_partition hp_t5325_partitions[] = { - }, - }; - -const struct flash_platform_data hp_t5325_flash = { -+const struct spi_flash_platform_data hp_t5325_flash = { - .type = "mx25l8005", - .name = "spi_flash", - .parts = hp_t5325_partitions, -diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c -b/arch/arm/mach-kirkwood/tsx1x-common.c -index f781164..14c7825 100644 ---- a/arch/arm/mach-kirkwood/tsx1x-common.c -+++ b/arch/arm/mach-kirkwood/tsx1x-common.c -@@ -59,7 +59,7 @@ struct mtd_partition qnap_tsx1x_partitions[] = { - }, - }; - -const struct flash_platform_data qnap_tsx1x_flash = { -+const struct spi_flash_platform_data qnap_tsx1x_flash = { - .type = "m25p128", - .name = "spi_flash", - .parts = qnap_tsx1x_partitions, -diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -index 02ff45f..b18bb24 100644 ---- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c -@@ -65,7 +65,7 @@ static struct mtd_partition -rd88f6183ap_ge_partitions[] = { - }, - }; - -static struct flash_platform_data rd88f6183ap_ge_spi_slave_data = { -+static struct spi_flash_platform_data rd88f6183ap_ge_spi_slave_data = { - .type = "m25p64", - .nr_parts = ARRAY_SIZE(rd88f6183ap_ge_partitions), - .parts = rd88f6183ap_ge_partitions, -diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c -index 7a1fa6a..12d7f7c 100644 ---- a/arch/arm/mach-w90x900/dev.c -+++ b/arch/arm/mach-w90x900/dev.c -@@ -246,7 +246,7 @@ static struct mtd_partition -nuc900_spi_flash_partitions[] = { - }, - }; - -static struct flash_platform_data nuc900_spi_flash_data = { -+static struct spi_flash_platform_data nuc900_spi_flash_data = { - .name = "m25p80", - .parts = nuc900_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(nuc900_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c -b/arch/blackfin/mach-bf518/boards/ezbrd.c -index b894c8a..ded02c1 100644 ---- a/arch/blackfin/mach-bf518/boards/ezbrd.c -+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c -@@ -178,7 +178,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c -b/arch/blackfin/mach-bf518/boards/tcm-bf518.c -index e6ce1d7..66817b0 100644 ---- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c -+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c -@@ -128,7 +128,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c -b/arch/blackfin/mach-bf527/boards/ad7160eval.c -index fc767ac..c43724b 100644 ---- a/arch/blackfin/mach-bf527/boards/ad7160eval.c -+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c -@@ -254,7 +254,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c -b/arch/blackfin/mach-bf527/boards/cm_bf527.c -index 2c31af7..3d5a3dc 100644 ---- a/arch/blackfin/mach-bf527/boards/cm_bf527.c -+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c -@@ -341,7 +341,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c -b/arch/blackfin/mach-bf527/boards/ezbrd.c -index 9a736a8..6670939 100644 ---- a/arch/blackfin/mach-bf527/boards/ezbrd.c -+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c -@@ -240,7 +240,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c -b/arch/blackfin/mach-bf527/boards/ezkit.c -index 9222bc0..78a07e7 100644 ---- a/arch/blackfin/mach-bf527/boards/ezkit.c -+++ b/arch/blackfin/mach-bf527/boards/ezkit.c -@@ -434,7 +434,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c -b/arch/blackfin/mach-bf527/boards/tll6527m.c -index 9ec5757..147374b 100644 ---- a/arch/blackfin/mach-bf527/boards/tll6527m.c -+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c -@@ -304,7 +304,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/H8606.c -b/arch/blackfin/mach-bf533/boards/H8606.c -index 2ce7b16..60ff37f 100644 ---- a/arch/blackfin/mach-bf533/boards/H8606.c -+++ b/arch/blackfin/mach-bf533/boards/H8606.c -@@ -149,7 +149,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c -b/arch/blackfin/mach-bf533/boards/blackstamp.c -index 20c1022..cbdcca1 100644 ---- a/arch/blackfin/mach-bf533/boards/blackstamp.c -+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c -@@ -93,7 +93,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c -b/arch/blackfin/mach-bf533/boards/cm_bf533.c -index adbe62a..6448686 100644 ---- a/arch/blackfin/mach-bf533/boards/cm_bf533.c -+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c -@@ -49,7 +49,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c -b/arch/blackfin/mach-bf533/boards/ezkit.c -index a1cb8e7..4e1ee73 100644 ---- a/arch/blackfin/mach-bf533/boards/ezkit.c -+++ b/arch/blackfin/mach-bf533/boards/ezkit.c -@@ -200,7 +200,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf533/boards/stamp.c -b/arch/blackfin/mach-bf533/boards/stamp.c -index b3b1cde..8554b38 100644 ---- a/arch/blackfin/mach-bf533/boards/stamp.c -+++ b/arch/blackfin/mach-bf533/boards/stamp.c -@@ -163,7 +163,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c -b/arch/blackfin/mach-bf537/boards/cm_bf537e.c -index 836698c..c1bb193 100644 ---- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c -+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c -@@ -51,7 +51,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c -b/arch/blackfin/mach-bf537/boards/cm_bf537u.c -index 2a85670..da1886e 100644 ---- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c -+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c -@@ -52,7 +52,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c -b/arch/blackfin/mach-bf537/boards/minotaur.c -index 4980051..c360f10 100644 ---- a/arch/blackfin/mach-bf537/boards/minotaur.c -+++ b/arch/blackfin/mach-bf537/boards/minotaur.c -@@ -149,7 +149,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c -b/arch/blackfin/mach-bf537/boards/pnav10.c -index b958078..aab7edd 100644 ---- a/arch/blackfin/mach-bf537/boards/pnav10.c -+++ b/arch/blackfin/mach-bf537/boards/pnav10.c -@@ -174,7 +174,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/stamp.c -b/arch/blackfin/mach-bf537/boards/stamp.c -index 3aa344c..633cbf0 100644 ---- a/arch/blackfin/mach-bf537/boards/stamp.c -+++ b/arch/blackfin/mach-bf537/boards/stamp.c -@@ -526,7 +526,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -@@ -1003,7 +1003,7 @@ static struct mtd_partition -bfin_spi_dataflash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_dataflash_data = { -+static struct spi_flash_platform_data bfin_spi_dataflash_data = { - .name = "SPI Dataflash", - .parts = bfin_spi_dataflash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions), -diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c -b/arch/blackfin/mach-bf537/boards/tcm_bf537.c -index 31498ad..557747f 100644 ---- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c -+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c -@@ -52,7 +52,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c -b/arch/blackfin/mach-bf538/boards/ezkit.c -index c6fb0a5..de9ab68 100644 ---- a/arch/blackfin/mach-bf538/boards/ezkit.c -+++ b/arch/blackfin/mach-bf538/boards/ezkit.c -@@ -493,7 +493,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c -b/arch/blackfin/mach-bf548/boards/cm_bf548.c -index f0c0eef..7effe25 100644 ---- a/arch/blackfin/mach-bf548/boards/cm_bf548.c -+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c -@@ -849,7 +849,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c -b/arch/blackfin/mach-bf548/boards/ezkit.c -index 216e269..1ab35e3 100644 ---- a/arch/blackfin/mach-bf548/boards/ezkit.c -+++ b/arch/blackfin/mach-bf548/boards/ezkit.c -@@ -957,7 +957,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c -b/arch/blackfin/mach-bf561/boards/acvilon.c -index 0b1c20f..7f69032 100644 ---- a/arch/blackfin/mach-bf561/boards/acvilon.c -+++ b/arch/blackfin/mach-bf561/boards/acvilon.c -@@ -359,7 +359,7 @@ static struct mtd_partition -bfin_spi_dataflash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_dataflash_data = { -+static struct spi_flash_platform_data bfin_spi_dataflash_data = { - .name = "SPI Dataflash", - .parts = bfin_spi_dataflash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions), -diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c -b/arch/blackfin/mach-bf561/boards/cm_bf561.c -index 087b6b0..80073ac 100644 ---- a/arch/blackfin/mach-bf561/boards/cm_bf561.c -+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c -@@ -50,7 +50,7 @@ static struct mtd_partition -bfin_spi_flash_partitions[] = { - } - }; - -static struct flash_platform_data bfin_spi_flash_data = { -+static struct spi_flash_platform_data bfin_spi_flash_data = { - .name = "m25p80", - .parts = bfin_spi_flash_partitions, - .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), -diff --git a/arch/mips/alchemy/devboards/db1200/platform.c -b/arch/mips/alchemy/devboards/db1200/platform.c -index fbb5593..ea9bf90 100644 ---- a/arch/mips/alchemy/devboards/db1200/platform.c -+++ b/arch/mips/alchemy/devboards/db1200/platform.c -@@ -50,7 +50,7 @@ static struct mtd_partition db1200_spiflash_parts[] = { - }, - }; - -static struct flash_platform_data db1200_spiflash_data = { -+static struct spi_flash_platform_data db1200_spiflash_data = { - .name = "s25fl001", - .parts = db1200_spiflash_parts, - .nr_parts = ARRAY_SIZE(db1200_spiflash_parts), -diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c -index bf5a002..4244468 100644 ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -776,7 +776,7 @@ static const struct spi_device_id *__devinit -jedec_probe(struct spi_device *spi) - static int __devinit m25p_probe(struct spi_device *spi) - { - const struct spi_device_id *id = spi_get_device_id(spi); -- struct flash_platform_data *data; -+ struct spi_flash_platform_data *data; - struct m25p *flash; - struct flash_info *info; - unsigned i; -diff --git a/drivers/mtd/devices/mtd_dataflash.c -b/drivers/mtd/devices/mtd_dataflash.c -index c5015cc..9cb2727 100644 ---- a/drivers/mtd/devices/mtd_dataflash.c -+++ b/drivers/mtd/devices/mtd_dataflash.c -@@ -634,7 +634,7 @@ add_dataflash_otp(struct spi_device *spi, char *name, - { - struct dataflash *priv; - struct mtd_info *device; -- struct flash_platform_data *pdata = spi->dev.platform_data; -+ struct spi_flash_platform_data *pdata = spi->dev.platform_data; - char *otp_tag = ""; - int err = 0; - diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c -index 684247a..989758d 100644 ---- a/drivers/mtd/devices/sst25l.c -+++ b/drivers/mtd/devices/sst25l.c -@@ -379,7 +379,7 @@ static int __init sst25l_probe(struct spi_device *spi) - { - struct flash_info *flash_info; - struct sst25l_flash *flash; -- struct flash_platform_data *data; -+ struct spi_flash_platform_data *data; - int ret, i; - flash_info = sst25l_match_device(spi); -diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c -index 0d4ceba..a9ac6b2 100644 ---- a/drivers/spi/spi_butterfly.c -+++ b/drivers/spi/spi_butterfly.c -@@ -183,7 +183,7 @@ static struct mtd_partition partitions[] = { { - .size = MTDPART_SIZ_FULL, - } }; - -static struct flash_platform_data flash = { -+static struct spi_flash_platform_data flash = { - .name = "butterflash", - .parts = partitions, - .nr_parts = ARRAY_SIZE(partitions), -diff --git a/include/linux/spi/flash.h b/include/linux/spi/flash.h -index 3f22932..946145e 100644 ---- a/include/linux/spi/flash.h -+++ b/include/linux/spi/flash.h -@@ -4,7 +4,7 @@ - struct mtd_partition; - /** -- * struct flash_platform_data: board-specific flash data -+ * struct spi_flash_platform_data: board-specific flash data - * @name: optional flash device name (eg, as used with mtdparts=) - * @parts: optional array of mtd_partitions for static partitioning - * @nr_parts: number of mtd_partitions for static partitoning -@@ -18,7 +18,7 @@ struct mtd_partition; - * Note that for DataFlash, sizes for pages, blocks, and sectors are - * rarely powers of two; and partitions should be sector-aligned. - */ --struct flash_platform_data { -+struct spi_flash_platform_data { - char *name; - struct mtd_partition *parts; - unsigned int nr_parts; --- -1.7.1 diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index ab984bd..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: message/rfc822; - name="Message joint" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename="Message joint" diff --git a/a/3.hdr b/a/3.hdr deleted file mode 100644 index 80d663a..0000000 --- a/a/3.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/x-vcard; charset=utf-8; - name="alexis_rodet.vcf" -Content-Transfer-Encoding: base64 -Content-Disposition: attachment; - filename="alexis_rodet.vcf" diff --git a/a/3.txt b/a/3.txt deleted file mode 100644 index 53f8af1..0000000 --- a/a/3.txt +++ /dev/null @@ -1,13 +0,0 @@ -begin:vcard -fn:Alexis RODET -n:RODET;Alexis -org:Brain Vision Systems -adr:;;32 rue du Javelot;PARIS;;75013;FRANCE -email;internet:alexis.rodet@bvs-tech.com -title:Hardware Engineer -tel;work:+33 9 53 92 14 41 -tel;fax:+33 9 58 92 14 41 -x-mozilla-html:FALSE -url:http://www.bvs-tech.com -version:2.1 -end:vcard diff --git a/a/content_digest b/N2/content_digest index 9750100..e9c17e4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,21 +1,16 @@ "ref\020101117160514.GA5308@n2100.arm.linux.org.uk\0" "ref\04CE6B27D.2000909@bvs-tech.com\0" "ref\020101121044720.GA6088@tarshish\0" - "From\0Alexis RODET <alexis.rodet@bvs-tech.com>\0" - "Subject\0Re: [PATCH] Renaming 'struct flash_platform_data' into 'struct spi_flash_platform_data' in include/linux/spi/flash.h\0" + "From\0alexis.rodet@bvs-tech.com (Alexis RODET)\0" + "Subject\0[PATCH] Renaming 'struct flash_platform_data' into 'struct spi_flash_platform_data' in include/linux/spi/flash.h\0" "Date\0Mon, 22 Nov 2010 10:58:06 +0100\0" - "To\0spi-devel-general@lists.sourceforge.net\0" - "Cc\0Grant Likely <grant.likely@secretlab.ca>" - linux-mtd@lists.infradead.org - David Brownell <dbrownell@users.sourceforge.net> - David Woodhouse <dwmw2@infradead.org> - " linux-arm-kernel@lists.infradead.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hello,\n" "\n" "As I discussed with Russell King on the list\n" - "linux-arm-kernel@lists.infradead.org, there is a problem with the double\n" + "linux-arm-kernel at lists.infradead.org, there is a problem with the double\n" "definition of 'struct flash_platform_data' that are incompatible:\n" "\n" "in arch/arm/include/asm/mach/flash.h:\n" @@ -49,1284 +44,41 @@ "I suppose the ARM version has no reason not to be platform independent, but that is an other problem.\n" "\n" "I propose to rename SPI version of the structure as it is the younger and it is included in a less number of files.\n" - "The patch (already sent on linux-arm-kernel@lists.infradead.org) is in attachment.\n" + "The patch (already sent on linux-arm-kernel at lists.infradead.org) is in attachment.\n" "\n" "Best regards,\n" "Alexis RODET\n" "\n" "\n" - "Le 21/11/2010 05:47, Baruch Siach a \303\251crit :\n" + "Le 21/11/2010 05:47, Baruch Siach a ?crit :\n" "> Hi Alexis,\n" ">\n" "> On Fri, Nov 19, 2010 at 06:23:09PM +0100, Alexis RODET wrote:\n" ">>> It would, however, be nice if _someone_ out there could produce a patch\n" ">> Here is the patch and here is the command line used for doing this:\n" "> You need to CC the MTD maintainer and mailing list (David Woodhouse \n" - "> <dwmw2@infradead.org>, and linux-mtd@lists.infradead.org respectively), and \n" + "> <dwmw2@infradead.org>, and linux-mtd at lists.infradead.org respectively), and \n" "> maybe also the SPI subsystem maintainers (David Brownell \n" "> <dbrownell@users.sourceforge.net>, Grant Likely <grant.likely@secretlab.ca>, \n" - "> spi-devel-general@lists.sourceforge.net).\n" + "> spi-devel-general at lists.sourceforge.net).\n" ">\n" "> baruch\n" - > - "\01:2\0" - "fn\0Message joint\0" - "b\0" - "Message-ID: <4CE6B27D.2000909@bvs-tech.com>\n" - "Date: Fri, 19 Nov 2010 18:23:09 +0100\n" + ">\n" + "\n" + "-------------- next part --------------\n" + "An embedded message was scrubbed...\n" "From: Alexis RODET <alexis.rodet@bvs-tech.com>\n" - "User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Lightning/1.0b2 Thunderbird/3.1.6\n" - "MIME-Version: 1.0\n" - "To: linux-arm-kernel@lists.infradead.org\n" "Subject: [PATCH] Renaming 'struct flash_platform_data' into 'struct spi_flash_platform_data'\n" " in include/linux/spi/flash.h\n" - "References: <20101117160514.GA5308@n2100.arm.linux.org.uk>\n" - "In-Reply-To: <20101117160514.GA5308@n2100.arm.linux.org.uk>\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 7bit\n" - "\n" - "Hello,\n" - "\n" - "> It would, however, be nice if _someone_ out there could produce a patch\n" - "Here is the patch and here is the command line used for doing this:\n" - "\n" - "find . \\( -name .git -prune -false -o -path \\\n" - "./include/linux/spi/flash.h \\ -o \\( -name \\*.c -execdir grep -q \\\n" - "'#include <linux/spi/flash.h>' \\{\\} \\; \\) \\) -execdir sed -i -e \\\n" - "'s/struct flash_platform_data/struct spi_flash_platform_data/' \\\n" - "\\{\\} \\+ -execdir git add \\{\\} \\+ -print\n" - "\n" - "I didn't test all compilations as I don't have blackfin compiler installed.\n" - "I compiled successfully for x86 with allyesconfig and for Freescale mx27\n" - "with allmodconfig minus some incompatible drivers.\n" - "\n" - "Best regards,\n" - "Alexis RODET\n" - "\n" - "---\n" - " arch/arm/mach-at91/board-cam60.c | 2 +-\n" - " arch/arm/mach-at91/board-ecbat91.c | 2 +-\n" - " arch/arm/mach-dove/dove-db-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/lacie_v2-common.c | 2 +-\n" - " arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/t5325-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/tsx1x-common.c | 2 +-\n" - " arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-\n" - " arch/arm/mach-w90x900/dev.c | 2 +-\n" - " arch/blackfin/mach-bf518/boards/ezbrd.c | 2 +-\n" - " arch/blackfin/mach-bf518/boards/tcm-bf518.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/ad7160eval.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/ezbrd.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/tll6527m.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/H8606.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/blackstamp.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/cm_bf533.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/stamp.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/minotaur.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/pnav10.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--\n" - " arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +-\n" - " arch/blackfin/mach-bf538/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 +-\n" - " arch/blackfin/mach-bf548/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf561/boards/acvilon.c | 2 +-\n" - " arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 +-\n" - " arch/mips/alchemy/devboards/db1200/platform.c | 2 +-\n" - " drivers/mtd/devices/m25p80.c | 2 +-\n" - " drivers/mtd/devices/mtd_dataflash.c | 2 +-\n" - " drivers/mtd/devices/sst25l.c | 2 +-\n" - " drivers/spi/spi_butterfly.c | 2 +-\n" - " include/linux/spi/flash.h | 4 ++--\n" - " 39 files changed, 41 insertions(+), 41 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-at91/board-cam60.c\n" - "b/arch/arm/mach-at91/board-cam60.c\n" - "index b54e3e6..50780b2 100644\n" - "--- a/arch/arm/mach-at91/board-cam60.c\n" - "+++ b/arch/arm/mach-at91/board-cam60.c\n" - "@@ -98,7 +98,7 @@ static struct mtd_partition cam60_spi_partitions[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data cam60_spi_flash_platform_data = {\n" - "+static struct spi_flash_platform_data cam60_spi_flash_platform_data = {\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= cam60_spi_partitions,\n" - " \t.nr_parts\t= ARRAY_SIZE(cam60_spi_partitions)\n" - "diff --git a/arch/arm/mach-at91/board-ecbat91.c\n" - "b/arch/arm/mach-at91/board-ecbat91.c\n" - "index 7b58c94..8598237 100644\n" - "--- a/arch/arm/mach-at91/board-ecbat91.c\n" - "+++ b/arch/arm/mach-at91/board-ecbat91.c\n" - "@@ -110,7 +110,7 @@ static struct mtd_partition __initdata\n" - "my_flash0_partitions[] =\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data __initdata my_flash0_platform = {\n" - "+static struct spi_flash_platform_data __initdata my_flash0_platform = {\n" - " \t.name\t\t= \"Removable flash card\",\n" - " \t.parts\t\t= my_flash0_partitions,\n" - " \t.nr_parts\t= ARRAY_SIZE(my_flash0_partitions)\n" - "diff --git a/arch/arm/mach-dove/dove-db-setup.c\n" - "b/arch/arm/mach-dove/dove-db-setup.c\n" - "index 95925aa..90f8f95 100644\n" - "--- a/arch/arm/mach-dove/dove-db-setup.c\n" - "+++ b/arch/arm/mach-dove/dove-db-setup.c\n" - "@@ -40,7 +40,7 @@ static struct mv_sata_platform_data dove_db_sata_data = {\n" - " * SPI Devices:\n" - " * \tSPI0: 4M Flash ST-M25P32-VMF6P\n" - "\n" - "****************************************************************************/\n" - "-static const struct flash_platform_data dove_db_spi_flash_data = {\n" - "+static const struct spi_flash_platform_data dove_db_spi_flash_data = {\n" - " \t.type\t\t= \"m25p64\",\n" - " };\n" - " diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "b/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "index 285edab..b60003f 100644\n" - "--- a/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "@@ -33,7 +33,7 @@ static struct mtd_partition lacie_v2_flash_parts[] = {\n" - " \t},\n" - " };\n" - " -static const struct flash_platform_data lacie_v2_flash = {\n" - "+static const struct spi_flash_platform_data lacie_v2_flash = {\n" - " \t.type\t\t= \"mx25l4005a\",\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= lacie_v2_flash_parts,\n" - "diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "index 1e5266f..16356c8 100644\n" - "--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "@@ -52,7 +52,7 @@ static struct dsa_platform_data\n" - "mv88f6281gtw_ge_switch_plat_data = {\n" - " \t.chip\t\t= &mv88f6281gtw_ge_switch_chip_data,\n" - " };\n" - " -static const struct flash_platform_data mv88f6281gtw_ge_spi_slave_data = {\n" - "+static const struct spi_flash_platform_data\n" - "mv88f6281gtw_ge_spi_slave_data = {\n" - " \t.type\t\t= \"mx25l12805d\",\n" - " };\n" - " diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "index 0049614..d3b706f 100644\n" - "--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "@@ -32,7 +32,7 @@ static struct mv_sata_platform_data\n" - "rd88f6192_sata_data = {\n" - " \t.n_ports\t= 2,\n" - " };\n" - " -static const struct flash_platform_data rd88F6192_spi_slave_data = {\n" - "+static const struct spi_flash_platform_data rd88F6192_spi_slave_data = {\n" - " \t.type\t\t= \"m25p128\",\n" - " };\n" - " diff --git a/arch/arm/mach-kirkwood/t5325-setup.c\n" - "b/arch/arm/mach-kirkwood/t5325-setup.c\n" - "index ce50e61..d086983 100644\n" - "--- a/arch/arm/mach-kirkwood/t5325-setup.c\n" - "+++ b/arch/arm/mach-kirkwood/t5325-setup.c\n" - "@@ -59,7 +59,7 @@ struct mtd_partition hp_t5325_partitions[] = {\n" - " \t},\n" - " };\n" - " -const struct flash_platform_data hp_t5325_flash = {\n" - "+const struct spi_flash_platform_data hp_t5325_flash = {\n" - " \t.type\t\t= \"mx25l8005\",\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= hp_t5325_partitions,\n" - "diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "b/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "index f781164..14c7825 100644\n" - "--- a/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "+++ b/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "@@ -59,7 +59,7 @@ struct mtd_partition qnap_tsx1x_partitions[] = {\n" - " \t},\n" - " };\n" - " -const struct flash_platform_data qnap_tsx1x_flash = {\n" - "+const struct spi_flash_platform_data qnap_tsx1x_flash = {\n" - " \t.type\t\t= \"m25p128\",\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= qnap_tsx1x_partitions,\n" - "diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "index 02ff45f..b18bb24 100644\n" - "--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "@@ -65,7 +65,7 @@ static struct mtd_partition\n" - "rd88f6183ap_ge_partitions[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data rd88f6183ap_ge_spi_slave_data = {\n" - "+static struct spi_flash_platform_data rd88f6183ap_ge_spi_slave_data = {\n" - " \t.type\t\t= \"m25p64\",\n" - " \t.nr_parts\t= ARRAY_SIZE(rd88f6183ap_ge_partitions),\n" - " \t.parts\t\t= rd88f6183ap_ge_partitions,\n" - "diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c\n" - "index 7a1fa6a..12d7f7c 100644\n" - "--- a/arch/arm/mach-w90x900/dev.c\n" - "+++ b/arch/arm/mach-w90x900/dev.c\n" - "@@ -246,7 +246,7 @@ static struct mtd_partition\n" - "nuc900_spi_flash_partitions[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data nuc900_spi_flash_data = {\n" - "+static struct spi_flash_platform_data nuc900_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = nuc900_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(nuc900_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "b/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "index b894c8a..ded02c1 100644\n" - "--- a/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "@@ -178,7 +178,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "b/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "index e6ce1d7..66817b0 100644\n" - "--- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "@@ -128,7 +128,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "b/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "index fc767ac..c43724b 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "@@ -254,7 +254,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "b/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "index 2c31af7..3d5a3dc 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "@@ -341,7 +341,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "b/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "index 9a736a8..6670939 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "@@ -240,7 +240,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "index 9222bc0..78a07e7 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "@@ -434,7 +434,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "b/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "index 9ec5757..147374b 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "@@ -304,7 +304,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/H8606.c\n" - "b/arch/blackfin/mach-bf533/boards/H8606.c\n" - "index 2ce7b16..60ff37f 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/H8606.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/H8606.c\n" - "@@ -149,7 +149,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "b/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "index 20c1022..cbdcca1 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "@@ -93,7 +93,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "b/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "index adbe62a..6448686 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "@@ -49,7 +49,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "index a1cb8e7..4e1ee73 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "@@ -200,7 +200,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/stamp.c\n" - "b/arch/blackfin/mach-bf533/boards/stamp.c\n" - "index b3b1cde..8554b38 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/stamp.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/stamp.c\n" - "@@ -163,7 +163,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "b/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "index 836698c..c1bb193 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "@@ -51,7 +51,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "b/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "index 2a85670..da1886e 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "@@ -52,7 +52,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "b/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "index 4980051..c360f10 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "@@ -149,7 +149,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "b/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "index b958078..aab7edd 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "@@ -174,7 +174,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/stamp.c\n" - "b/arch/blackfin/mach-bf537/boards/stamp.c\n" - "index 3aa344c..633cbf0 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/stamp.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/stamp.c\n" - "@@ -526,7 +526,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "@@ -1003,7 +1003,7 @@ static struct mtd_partition\n" - "bfin_spi_dataflash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_dataflash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_dataflash_data = {\n" - " \t.name = \"SPI Dataflash\",\n" - " \t.parts = bfin_spi_dataflash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "b/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "index 31498ad..557747f 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "@@ -52,7 +52,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "index c6fb0a5..de9ab68 100644\n" - "--- a/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "@@ -493,7 +493,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "b/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "index f0c0eef..7effe25 100644\n" - "--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "@@ -849,7 +849,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "index 216e269..1ab35e3 100644\n" - "--- a/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "@@ -957,7 +957,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "b/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "index 0b1c20f..7f69032 100644\n" - "--- a/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "+++ b/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "@@ -359,7 +359,7 @@ static struct mtd_partition\n" - "bfin_spi_dataflash_partitions[] = {\n" - " \t }\n" - " };\n" - " -static struct flash_platform_data bfin_spi_dataflash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_dataflash_data = {\n" - " \t.name = \"SPI Dataflash\",\n" - " \t.parts = bfin_spi_dataflash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "b/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "index 087b6b0..80073ac 100644\n" - "--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "@@ -50,7 +50,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/mips/alchemy/devboards/db1200/platform.c\n" - "b/arch/mips/alchemy/devboards/db1200/platform.c\n" - "index fbb5593..ea9bf90 100644\n" - "--- a/arch/mips/alchemy/devboards/db1200/platform.c\n" - "+++ b/arch/mips/alchemy/devboards/db1200/platform.c\n" - "@@ -50,7 +50,7 @@ static struct mtd_partition db1200_spiflash_parts[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data db1200_spiflash_data = {\n" - "+static struct spi_flash_platform_data db1200_spiflash_data = {\n" - " \t.name\t\t= \"s25fl001\",\n" - " \t.parts\t\t= db1200_spiflash_parts,\n" - " \t.nr_parts\t= ARRAY_SIZE(db1200_spiflash_parts),\n" - "diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c\n" - "index bf5a002..4244468 100644\n" - "--- a/drivers/mtd/devices/m25p80.c\n" - "+++ b/drivers/mtd/devices/m25p80.c\n" - "@@ -776,7 +776,7 @@ static const struct spi_device_id *__devinit\n" - "jedec_probe(struct spi_device *spi)\n" - " static int __devinit m25p_probe(struct spi_device *spi)\n" - " {\n" - " \tconst struct spi_device_id\t*id = spi_get_device_id(spi);\n" - "-\tstruct flash_platform_data\t*data;\n" - "+\tstruct spi_flash_platform_data\t*data;\n" - " \tstruct m25p\t\t\t*flash;\n" - " \tstruct flash_info\t\t*info;\n" - " \tunsigned\t\t\ti;\n" - "diff --git a/drivers/mtd/devices/mtd_dataflash.c\n" - "b/drivers/mtd/devices/mtd_dataflash.c\n" - "index c5015cc..9cb2727 100644\n" - "--- a/drivers/mtd/devices/mtd_dataflash.c\n" - "+++ b/drivers/mtd/devices/mtd_dataflash.c\n" - "@@ -634,7 +634,7 @@ add_dataflash_otp(struct spi_device *spi, char *name,\n" - " {\n" - " \tstruct dataflash\t\t*priv;\n" - " \tstruct mtd_info\t\t\t*device;\n" - "-\tstruct flash_platform_data\t*pdata = spi->dev.platform_data;\n" - "+\tstruct spi_flash_platform_data\t*pdata = spi->dev.platform_data;\n" - " \tchar\t\t\t\t*otp_tag = \"\";\n" - " \tint\t\t\t\terr = 0;\n" - " diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c\n" - "index 684247a..989758d 100644\n" - "--- a/drivers/mtd/devices/sst25l.c\n" - "+++ b/drivers/mtd/devices/sst25l.c\n" - "@@ -379,7 +379,7 @@ static int __init sst25l_probe(struct spi_device *spi)\n" - " {\n" - " \tstruct flash_info *flash_info;\n" - " \tstruct sst25l_flash *flash;\n" - "-\tstruct flash_platform_data *data;\n" - "+\tstruct spi_flash_platform_data *data;\n" - " \tint ret, i;\n" - " \tflash_info = sst25l_match_device(spi);\n" - "diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c\n" - "index 0d4ceba..a9ac6b2 100644\n" - "--- a/drivers/spi/spi_butterfly.c\n" - "+++ b/drivers/spi/spi_butterfly.c\n" - "@@ -183,7 +183,7 @@ static struct mtd_partition partitions[] = { {\n" - " \t.size\t\t= MTDPART_SIZ_FULL,\n" - " } };\n" - " -static struct flash_platform_data flash = {\n" - "+static struct spi_flash_platform_data flash = {\n" - " \t.name\t\t= \"butterflash\",\n" - " \t.parts\t\t= partitions,\n" - " \t.nr_parts\t= ARRAY_SIZE(partitions),\n" - "diff --git a/include/linux/spi/flash.h b/include/linux/spi/flash.h\n" - "index 3f22932..946145e 100644\n" - "--- a/include/linux/spi/flash.h\n" - "+++ b/include/linux/spi/flash.h\n" - "@@ -4,7 +4,7 @@\n" - " struct mtd_partition;\n" - " /**\n" - "- * struct flash_platform_data: board-specific flash data\n" - "+ * struct spi_flash_platform_data: board-specific flash data\n" - " * @name: optional flash device name (eg, as used with mtdparts=)\n" - " * @parts: optional array of mtd_partitions for static partitioning\n" - " * @nr_parts: number of mtd_partitions for static partitoning\n" - "@@ -18,7 +18,7 @@ struct mtd_partition;\n" - " * Note that for DataFlash, sizes for pages, blocks, and sectors are\n" - " * rarely powers of two; and partitions should be sector-aligned.\n" - " */\n" - "-struct flash_platform_data {\n" - "+struct spi_flash_platform_data {\n" - " \tchar\t\t*name;\n" - " \tstruct mtd_partition *parts;\n" - " \tunsigned int\tnr_parts;\n" - "-- \n" - "1.7.1\n" - "\n" - "\02:2.1\0" - "b\0" - "Hello,\n" - "\n" - "> It would, however, be nice if _someone_ out there could produce a patch\n" - "Here is the patch and here is the command line used for doing this:\n" - "\n" - "find . \\( -name .git -prune -false -o -path \\\n" - "./include/linux/spi/flash.h \\ -o \\( -name \\*.c -execdir grep -q \\\n" - "'#include <linux/spi/flash.h>' \\{\\} \\; \\) \\) -execdir sed -i -e \\\n" - "'s/struct flash_platform_data/struct spi_flash_platform_data/' \\\n" - "\\{\\} \\+ -execdir git add \\{\\} \\+ -print\n" - "\n" - "I didn't test all compilations as I don't have blackfin compiler installed.\n" - "I compiled successfully for x86 with allyesconfig and for Freescale mx27\n" - "with allmodconfig minus some incompatible drivers.\n" - "\n" - "Best regards,\n" - "Alexis RODET\n" - "\n" - "---\n" - " arch/arm/mach-at91/board-cam60.c | 2 +-\n" - " arch/arm/mach-at91/board-ecbat91.c | 2 +-\n" - " arch/arm/mach-dove/dove-db-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/lacie_v2-common.c | 2 +-\n" - " arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/t5325-setup.c | 2 +-\n" - " arch/arm/mach-kirkwood/tsx1x-common.c | 2 +-\n" - " arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-\n" - " arch/arm/mach-w90x900/dev.c | 2 +-\n" - " arch/blackfin/mach-bf518/boards/ezbrd.c | 2 +-\n" - " arch/blackfin/mach-bf518/boards/tcm-bf518.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/ad7160eval.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/ezbrd.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf527/boards/tll6527m.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/H8606.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/blackstamp.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/cm_bf533.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf533/boards/stamp.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/minotaur.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/pnav10.c | 2 +-\n" - " arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--\n" - " arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +-\n" - " arch/blackfin/mach-bf538/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 +-\n" - " arch/blackfin/mach-bf548/boards/ezkit.c | 2 +-\n" - " arch/blackfin/mach-bf561/boards/acvilon.c | 2 +-\n" - " arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 +-\n" - " arch/mips/alchemy/devboards/db1200/platform.c | 2 +-\n" - " drivers/mtd/devices/m25p80.c | 2 +-\n" - " drivers/mtd/devices/mtd_dataflash.c | 2 +-\n" - " drivers/mtd/devices/sst25l.c | 2 +-\n" - " drivers/spi/spi_butterfly.c | 2 +-\n" - " include/linux/spi/flash.h | 4 ++--\n" - " 39 files changed, 41 insertions(+), 41 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-at91/board-cam60.c\n" - "b/arch/arm/mach-at91/board-cam60.c\n" - "index b54e3e6..50780b2 100644\n" - "--- a/arch/arm/mach-at91/board-cam60.c\n" - "+++ b/arch/arm/mach-at91/board-cam60.c\n" - "@@ -98,7 +98,7 @@ static struct mtd_partition cam60_spi_partitions[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data cam60_spi_flash_platform_data = {\n" - "+static struct spi_flash_platform_data cam60_spi_flash_platform_data = {\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= cam60_spi_partitions,\n" - " \t.nr_parts\t= ARRAY_SIZE(cam60_spi_partitions)\n" - "diff --git a/arch/arm/mach-at91/board-ecbat91.c\n" - "b/arch/arm/mach-at91/board-ecbat91.c\n" - "index 7b58c94..8598237 100644\n" - "--- a/arch/arm/mach-at91/board-ecbat91.c\n" - "+++ b/arch/arm/mach-at91/board-ecbat91.c\n" - "@@ -110,7 +110,7 @@ static struct mtd_partition __initdata\n" - "my_flash0_partitions[] =\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data __initdata my_flash0_platform = {\n" - "+static struct spi_flash_platform_data __initdata my_flash0_platform = {\n" - " \t.name\t\t= \"Removable flash card\",\n" - " \t.parts\t\t= my_flash0_partitions,\n" - " \t.nr_parts\t= ARRAY_SIZE(my_flash0_partitions)\n" - "diff --git a/arch/arm/mach-dove/dove-db-setup.c\n" - "b/arch/arm/mach-dove/dove-db-setup.c\n" - "index 95925aa..90f8f95 100644\n" - "--- a/arch/arm/mach-dove/dove-db-setup.c\n" - "+++ b/arch/arm/mach-dove/dove-db-setup.c\n" - "@@ -40,7 +40,7 @@ static struct mv_sata_platform_data dove_db_sata_data = {\n" - " * SPI Devices:\n" - " * \tSPI0: 4M Flash ST-M25P32-VMF6P\n" - "\n" - "****************************************************************************/\n" - "-static const struct flash_platform_data dove_db_spi_flash_data = {\n" - "+static const struct spi_flash_platform_data dove_db_spi_flash_data = {\n" - " \t.type\t\t= \"m25p64\",\n" - " };\n" - " diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "b/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "index 285edab..b60003f 100644\n" - "--- a/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c\n" - "@@ -33,7 +33,7 @@ static struct mtd_partition lacie_v2_flash_parts[] = {\n" - " \t},\n" - " };\n" - " -static const struct flash_platform_data lacie_v2_flash = {\n" - "+static const struct spi_flash_platform_data lacie_v2_flash = {\n" - " \t.type\t\t= \"mx25l4005a\",\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= lacie_v2_flash_parts,\n" - "diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "index 1e5266f..16356c8 100644\n" - "--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c\n" - "@@ -52,7 +52,7 @@ static struct dsa_platform_data\n" - "mv88f6281gtw_ge_switch_plat_data = {\n" - " \t.chip\t\t= &mv88f6281gtw_ge_switch_chip_data,\n" - " };\n" - " -static const struct flash_platform_data mv88f6281gtw_ge_spi_slave_data = {\n" - "+static const struct spi_flash_platform_data\n" - "mv88f6281gtw_ge_spi_slave_data = {\n" - " \t.type\t\t= \"mx25l12805d\",\n" - " };\n" - " diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "index 0049614..d3b706f 100644\n" - "--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c\n" - "@@ -32,7 +32,7 @@ static struct mv_sata_platform_data\n" - "rd88f6192_sata_data = {\n" - " \t.n_ports\t= 2,\n" - " };\n" - " -static const struct flash_platform_data rd88F6192_spi_slave_data = {\n" - "+static const struct spi_flash_platform_data rd88F6192_spi_slave_data = {\n" - " \t.type\t\t= \"m25p128\",\n" - " };\n" - " diff --git a/arch/arm/mach-kirkwood/t5325-setup.c\n" - "b/arch/arm/mach-kirkwood/t5325-setup.c\n" - "index ce50e61..d086983 100644\n" - "--- a/arch/arm/mach-kirkwood/t5325-setup.c\n" - "+++ b/arch/arm/mach-kirkwood/t5325-setup.c\n" - "@@ -59,7 +59,7 @@ struct mtd_partition hp_t5325_partitions[] = {\n" - " \t},\n" - " };\n" - " -const struct flash_platform_data hp_t5325_flash = {\n" - "+const struct spi_flash_platform_data hp_t5325_flash = {\n" - " \t.type\t\t= \"mx25l8005\",\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= hp_t5325_partitions,\n" - "diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "b/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "index f781164..14c7825 100644\n" - "--- a/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "+++ b/arch/arm/mach-kirkwood/tsx1x-common.c\n" - "@@ -59,7 +59,7 @@ struct mtd_partition qnap_tsx1x_partitions[] = {\n" - " \t},\n" - " };\n" - " -const struct flash_platform_data qnap_tsx1x_flash = {\n" - "+const struct spi_flash_platform_data qnap_tsx1x_flash = {\n" - " \t.type\t\t= \"m25p128\",\n" - " \t.name\t\t= \"spi_flash\",\n" - " \t.parts\t\t= qnap_tsx1x_partitions,\n" - "diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "index 02ff45f..b18bb24 100644\n" - "--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c\n" - "@@ -65,7 +65,7 @@ static struct mtd_partition\n" - "rd88f6183ap_ge_partitions[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data rd88f6183ap_ge_spi_slave_data = {\n" - "+static struct spi_flash_platform_data rd88f6183ap_ge_spi_slave_data = {\n" - " \t.type\t\t= \"m25p64\",\n" - " \t.nr_parts\t= ARRAY_SIZE(rd88f6183ap_ge_partitions),\n" - " \t.parts\t\t= rd88f6183ap_ge_partitions,\n" - "diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c\n" - "index 7a1fa6a..12d7f7c 100644\n" - "--- a/arch/arm/mach-w90x900/dev.c\n" - "+++ b/arch/arm/mach-w90x900/dev.c\n" - "@@ -246,7 +246,7 @@ static struct mtd_partition\n" - "nuc900_spi_flash_partitions[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data nuc900_spi_flash_data = {\n" - "+static struct spi_flash_platform_data nuc900_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = nuc900_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(nuc900_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "b/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "index b894c8a..ded02c1 100644\n" - "--- a/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c\n" - "@@ -178,7 +178,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "b/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "index e6ce1d7..66817b0 100644\n" - "--- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c\n" - "@@ -128,7 +128,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "b/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "index fc767ac..c43724b 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c\n" - "@@ -254,7 +254,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "b/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "index 2c31af7..3d5a3dc 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c\n" - "@@ -341,7 +341,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "b/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "index 9a736a8..6670939 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c\n" - "@@ -240,7 +240,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "index 9222bc0..78a07e7 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/ezkit.c\n" - "@@ -434,7 +434,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "b/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "index 9ec5757..147374b 100644\n" - "--- a/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c\n" - "@@ -304,7 +304,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/H8606.c\n" - "b/arch/blackfin/mach-bf533/boards/H8606.c\n" - "index 2ce7b16..60ff37f 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/H8606.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/H8606.c\n" - "@@ -149,7 +149,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "b/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "index 20c1022..cbdcca1 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c\n" - "@@ -93,7 +93,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "b/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "index adbe62a..6448686 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c\n" - "@@ -49,7 +49,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "index a1cb8e7..4e1ee73 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/ezkit.c\n" - "@@ -200,7 +200,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf533/boards/stamp.c\n" - "b/arch/blackfin/mach-bf533/boards/stamp.c\n" - "index b3b1cde..8554b38 100644\n" - "--- a/arch/blackfin/mach-bf533/boards/stamp.c\n" - "+++ b/arch/blackfin/mach-bf533/boards/stamp.c\n" - "@@ -163,7 +163,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "b/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "index 836698c..c1bb193 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c\n" - "@@ -51,7 +51,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "b/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "index 2a85670..da1886e 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c\n" - "@@ -52,7 +52,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "b/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "index 4980051..c360f10 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/minotaur.c\n" - "@@ -149,7 +149,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "b/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "index b958078..aab7edd 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/pnav10.c\n" - "@@ -174,7 +174,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/stamp.c\n" - "b/arch/blackfin/mach-bf537/boards/stamp.c\n" - "index 3aa344c..633cbf0 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/stamp.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/stamp.c\n" - "@@ -526,7 +526,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "@@ -1003,7 +1003,7 @@ static struct mtd_partition\n" - "bfin_spi_dataflash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_dataflash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_dataflash_data = {\n" - " \t.name = \"SPI Dataflash\",\n" - " \t.parts = bfin_spi_dataflash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "b/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "index 31498ad..557747f 100644\n" - "--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c\n" - "@@ -52,7 +52,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "index c6fb0a5..de9ab68 100644\n" - "--- a/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf538/boards/ezkit.c\n" - "@@ -493,7 +493,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "b/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "index f0c0eef..7effe25 100644\n" - "--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c\n" - "@@ -849,7 +849,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "b/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "index 216e269..1ab35e3 100644\n" - "--- a/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "+++ b/arch/blackfin/mach-bf548/boards/ezkit.c\n" - "@@ -957,7 +957,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "b/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "index 0b1c20f..7f69032 100644\n" - "--- a/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "+++ b/arch/blackfin/mach-bf561/boards/acvilon.c\n" - "@@ -359,7 +359,7 @@ static struct mtd_partition\n" - "bfin_spi_dataflash_partitions[] = {\n" - " \t }\n" - " };\n" - " -static struct flash_platform_data bfin_spi_dataflash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_dataflash_data = {\n" - " \t.name = \"SPI Dataflash\",\n" - " \t.parts = bfin_spi_dataflash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions),\n" - "diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "b/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "index 087b6b0..80073ac 100644\n" - "--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c\n" - "@@ -50,7 +50,7 @@ static struct mtd_partition\n" - "bfin_spi_flash_partitions[] = {\n" - " \t}\n" - " };\n" - " -static struct flash_platform_data bfin_spi_flash_data = {\n" - "+static struct spi_flash_platform_data bfin_spi_flash_data = {\n" - " \t.name = \"m25p80\",\n" - " \t.parts = bfin_spi_flash_partitions,\n" - " \t.nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),\n" - "diff --git a/arch/mips/alchemy/devboards/db1200/platform.c\n" - "b/arch/mips/alchemy/devboards/db1200/platform.c\n" - "index fbb5593..ea9bf90 100644\n" - "--- a/arch/mips/alchemy/devboards/db1200/platform.c\n" - "+++ b/arch/mips/alchemy/devboards/db1200/platform.c\n" - "@@ -50,7 +50,7 @@ static struct mtd_partition db1200_spiflash_parts[] = {\n" - " \t},\n" - " };\n" - " -static struct flash_platform_data db1200_spiflash_data = {\n" - "+static struct spi_flash_platform_data db1200_spiflash_data = {\n" - " \t.name\t\t= \"s25fl001\",\n" - " \t.parts\t\t= db1200_spiflash_parts,\n" - " \t.nr_parts\t= ARRAY_SIZE(db1200_spiflash_parts),\n" - "diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c\n" - "index bf5a002..4244468 100644\n" - "--- a/drivers/mtd/devices/m25p80.c\n" - "+++ b/drivers/mtd/devices/m25p80.c\n" - "@@ -776,7 +776,7 @@ static const struct spi_device_id *__devinit\n" - "jedec_probe(struct spi_device *spi)\n" - " static int __devinit m25p_probe(struct spi_device *spi)\n" - " {\n" - " \tconst struct spi_device_id\t*id = spi_get_device_id(spi);\n" - "-\tstruct flash_platform_data\t*data;\n" - "+\tstruct spi_flash_platform_data\t*data;\n" - " \tstruct m25p\t\t\t*flash;\n" - " \tstruct flash_info\t\t*info;\n" - " \tunsigned\t\t\ti;\n" - "diff --git a/drivers/mtd/devices/mtd_dataflash.c\n" - "b/drivers/mtd/devices/mtd_dataflash.c\n" - "index c5015cc..9cb2727 100644\n" - "--- a/drivers/mtd/devices/mtd_dataflash.c\n" - "+++ b/drivers/mtd/devices/mtd_dataflash.c\n" - "@@ -634,7 +634,7 @@ add_dataflash_otp(struct spi_device *spi, char *name,\n" - " {\n" - " \tstruct dataflash\t\t*priv;\n" - " \tstruct mtd_info\t\t\t*device;\n" - "-\tstruct flash_platform_data\t*pdata = spi->dev.platform_data;\n" - "+\tstruct spi_flash_platform_data\t*pdata = spi->dev.platform_data;\n" - " \tchar\t\t\t\t*otp_tag = \"\";\n" - " \tint\t\t\t\terr = 0;\n" - " diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c\n" - "index 684247a..989758d 100644\n" - "--- a/drivers/mtd/devices/sst25l.c\n" - "+++ b/drivers/mtd/devices/sst25l.c\n" - "@@ -379,7 +379,7 @@ static int __init sst25l_probe(struct spi_device *spi)\n" - " {\n" - " \tstruct flash_info *flash_info;\n" - " \tstruct sst25l_flash *flash;\n" - "-\tstruct flash_platform_data *data;\n" - "+\tstruct spi_flash_platform_data *data;\n" - " \tint ret, i;\n" - " \tflash_info = sst25l_match_device(spi);\n" - "diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c\n" - "index 0d4ceba..a9ac6b2 100644\n" - "--- a/drivers/spi/spi_butterfly.c\n" - "+++ b/drivers/spi/spi_butterfly.c\n" - "@@ -183,7 +183,7 @@ static struct mtd_partition partitions[] = { {\n" - " \t.size\t\t= MTDPART_SIZ_FULL,\n" - " } };\n" - " -static struct flash_platform_data flash = {\n" - "+static struct spi_flash_platform_data flash = {\n" - " \t.name\t\t= \"butterflash\",\n" - " \t.parts\t\t= partitions,\n" - " \t.nr_parts\t= ARRAY_SIZE(partitions),\n" - "diff --git a/include/linux/spi/flash.h b/include/linux/spi/flash.h\n" - "index 3f22932..946145e 100644\n" - "--- a/include/linux/spi/flash.h\n" - "+++ b/include/linux/spi/flash.h\n" - "@@ -4,7 +4,7 @@\n" - " struct mtd_partition;\n" - " /**\n" - "- * struct flash_platform_data: board-specific flash data\n" - "+ * struct spi_flash_platform_data: board-specific flash data\n" - " * @name: optional flash device name (eg, as used with mtdparts=)\n" - " * @parts: optional array of mtd_partitions for static partitioning\n" - " * @nr_parts: number of mtd_partitions for static partitoning\n" - "@@ -18,7 +18,7 @@ struct mtd_partition;\n" - " * Note that for DataFlash, sizes for pages, blocks, and sectors are\n" - " * rarely powers of two; and partitions should be sector-aligned.\n" - " */\n" - "-struct flash_platform_data {\n" - "+struct spi_flash_platform_data {\n" - " \tchar\t\t*name;\n" - " \tstruct mtd_partition *parts;\n" - " \tunsigned int\tnr_parts;\n" - "-- \n" - 1.7.1 - "\01:3\0" - "fn\0alexis_rodet.vcf\0" - "b\0" - "begin:vcard\n" - "fn:Alexis RODET\n" - "n:RODET;Alexis\n" - "org:Brain Vision Systems\n" - "adr:;;32 rue du Javelot;PARIS;;75013;FRANCE\n" - "email;internet:alexis.rodet@bvs-tech.com\n" - "title:Hardware Engineer\n" - "tel;work:+33 9 53 92 14 41\n" - "tel;fax:+33 9 58 92 14 41\n" - "x-mozilla-html:FALSE\n" - "url:http://www.bvs-tech.com\n" - "version:2.1\n" - end:vcard + "Date: Fri, 19 Nov 2010 18:23:09 +0100\n" + "Size: 25208\n" + "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101122/8f4f2919/attachment-0001.mht>\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: alexis_rodet.vcf\n" + "Type: text/x-vcard\n" + "Size: 315 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101122/8f4f2919/attachment-0001.vcf> -b53d57a0e7b87c41ebb2154242468be6d70c4a2b2cfa071d22c39b5573218b47 +c8ba7c08b33d166d246c2432655d6817c1164fec6bfa1f83d2def166b8f3fa4c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.