diff for duplicates of <1497901338.8495.50.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 9a2d128..04923a4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,25 +26,25 @@ index 247f71b02235..3cb8d92ee870 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -191,7 +191,10 @@ static inline void bcm_spi_writew(struct bcm63xx_spi *bs, - #endif - } - +?#endif +?} +? -static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = { +static const struct { + unsigned int speed; + unsigned int index; +} bcm63xx_spi_freq_table[] = { - { 20000000, SPI_CLK_20MHZ }, - { 12500000, SPI_CLK_12_50MHZ }, - { 6250000, SPI_CLK_6_250MHZ }, +? { 20000000, SPI_CLK_20MHZ }, +? { 12500000, SPI_CLK_12_50MHZ }, +? {??6250000, SPI_CLK_6_250MHZ }, @@ -213,8 +216,8 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi, - - /* Find the closest clock configuration */ - for (i = 0; i < SPI_CLK_MASK; i++) { +? +? /* Find the closest clock configuration */ +? for (i = 0; i < SPI_CLK_MASK; i++) { - if (t->speed_hz >= bcm63xx_spi_freq_table[i][0]) { - clk_cfg = bcm63xx_spi_freq_table[i][1]; + if (t->speed_hz >= bcm63xx_spi_freq_table[i].speed) { + clk_cfg = bcm63xx_spi_freq_table[i].index; - break; - } - } +? break; +? } +? } diff --git a/a/content_digest b/N1/content_digest index 4385303..53ec514 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\01497896268-5613-1-git-send-email-aravind.thk@gmail.com\0" - "From\0Joe Perches <joe@perches.com>\0" - "Subject\0Re: [PATCH v2] spi/bcm63xx: Fix checkpatch warnings\0" + "From\0joe@perches.com (Joe Perches)\0" + "Subject\0[PATCH v2] spi/bcm63xx: Fix checkpatch warnings\0" "Date\0Mon, 19 Jun 2017 12:42:18 -0700\0" - "To\0Aravind Thokala <aravind.thk@gmail.com>" - Mark Brown <broonie@kernel.org> - " Florian Fainelli <f.fainelli@gmail.com>\0" - "Cc\0bcm-kernel-feedback-list@broadcom.com" - linux-spi@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 2017-06-19 at 23:47 +0530, Aravind Thokala wrote:\n" @@ -39,27 +33,27 @@ "--- a/drivers/spi/spi-bcm63xx.c\n" "+++ b/drivers/spi/spi-bcm63xx.c\n" "@@ -191,7 +191,10 @@ static inline void bcm_spi_writew(struct bcm63xx_spi *bs,\n" - "\302\240#endif\n" - "\302\240}\n" - "\302\240\n" + "?#endif\n" + "?}\n" + "?\n" "-static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = {\n" "+static const struct {\n" "+\tunsigned int speed;\n" "+\tunsigned int index;\n" "+} bcm63xx_spi_freq_table[] = {\n" - "\302\240\t{ 20000000, SPI_CLK_20MHZ },\n" - "\302\240\t{ 12500000, SPI_CLK_12_50MHZ },\n" - "\302\240\t{\302\240\302\2406250000, SPI_CLK_6_250MHZ },\n" + "?\t{ 20000000, SPI_CLK_20MHZ },\n" + "?\t{ 12500000, SPI_CLK_12_50MHZ },\n" + "?\t{??6250000, SPI_CLK_6_250MHZ },\n" "@@ -213,8 +216,8 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi,\n" - "\302\240\n" - "\302\240\t/* Find the closest clock configuration */\n" - "\302\240\tfor (i = 0; i < SPI_CLK_MASK; i++) {\n" + "?\n" + "?\t/* Find the closest clock configuration */\n" + "?\tfor (i = 0; i < SPI_CLK_MASK; i++) {\n" "-\t\tif (t->speed_hz >= bcm63xx_spi_freq_table[i][0]) {\n" "-\t\t\tclk_cfg = bcm63xx_spi_freq_table[i][1];\n" "+\t\tif (t->speed_hz >= bcm63xx_spi_freq_table[i].speed) {\n" "+\t\t\tclk_cfg = bcm63xx_spi_freq_table[i].index;\n" - "\302\240\t\t\tbreak;\n" - "\302\240\t\t}\n" - "\302\240\t}" + "?\t\t\tbreak;\n" + "?\t\t}\n" + "?\t}" -923327711a78cbb2eff8acf5fbd5d0fbe989e627ab642511fa8b0b71269a0b76 +ad800fbe713cdc0581d9eb6348913f8d9cc9d7d3eed05308c86ba29d38771270
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.