diff for duplicates of <20201030151758.1241164-3-arnd@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 405f989..9edfb98 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -101,7 +101,8 @@ index 1c53408f5d47..000000000000 - -static unsigned int net_debug = NET_DEBUG; - --static const char version[] - "am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\n"; +-static const char version[] = +- "am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\n"; - -/* --------------------------------------------------------------------------- */ - @@ -244,7 +245,7 @@ index 1c53408f5d47..000000000000 - printk ("%s: buffer error (%02X %02X) %05X - ", dev->name, val, buffer[i], i); - error = 1; - errorcount ++; -- } else if (error && buffer[i] = val) { +- } else if (error && buffer[i] == val) { - printk ("%05X\n", i); - error = 0; - } @@ -456,7 +457,7 @@ index 1c53408f5d47..000000000000 - /* - * Spin waiting for chip to report suspend mode - */ -- while ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) = 0) { +- while ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) == 0) { - spin_unlock_irqrestore(&priv->chip_lock, flags); - nop(); - spin_lock_irqsave(&priv->chip_lock, flags); @@ -712,7 +713,7 @@ index 1c53408f5d47..000000000000 -{ - static unsigned version_printed; - -- if (net_debug && version_printed++ = 0) +- if (net_debug && version_printed++ == 0) - printk(KERN_INFO "%s", version); -} -static const struct net_device_ops am79c961_netdev_ops = { @@ -796,7 +797,7 @@ index 1c53408f5d47..000000000000 - dev->netdev_ops = &am79c961_netdev_ops; - - ret = register_netdev(dev); -- if (ret = 0) { +- if (ret == 0) { - printk(KERN_INFO "%s: ether address %pM\n", - dev->name, dev->dev_addr); - return 0; diff --git a/a/content_digest b/N1/content_digest index d2dc52f..47cd900 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020201030151758.1241164-1-arnd@kernel.org\0" "From\0Arnd Bergmann <arnd@kernel.org>\0" "Subject\0[PATCH v2 02/15] net: remove am79c961a driver\0" - "Date\0Fri, 30 Oct 2020 15:17:45 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:45 +0100\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Thomas Gleixner <tglx@linutronix.de>" Arnd Bergmann <arnd@arndb.de> @@ -130,7 +130,8 @@ "-\n" "-static unsigned int net_debug = NET_DEBUG;\n" "-\n" - "-static const char version[] -\t\"am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\\n\";\n" + "-static const char version[] =\n" + "-\t\"am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\\n\";\n" "-\n" "-/* --------------------------------------------------------------------------- */\n" "-\n" @@ -273,7 +274,7 @@ "-\t\t\tprintk (\"%s: buffer error (%02X %02X) %05X - \", dev->name, val, buffer[i], i);\n" "-\t\t\terror = 1;\n" "-\t\t\terrorcount ++;\n" - "-\t\t} else if (error && buffer[i] = val) {\n" + "-\t\t} else if (error && buffer[i] == val) {\n" "-\t\t\tprintk (\"%05X\\n\", i);\n" "-\t\t\terror = 0;\n" "-\t\t}\n" @@ -485,7 +486,7 @@ "-\t\t/*\n" "-\t\t * Spin waiting for chip to report suspend mode\n" "-\t\t */\n" - "-\t\twhile ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) = 0) {\n" + "-\t\twhile ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) == 0) {\n" "-\t\t\tspin_unlock_irqrestore(&priv->chip_lock, flags);\n" "-\t\t\tnop();\n" "-\t\t\tspin_lock_irqsave(&priv->chip_lock, flags);\n" @@ -741,7 +742,7 @@ "-{\n" "-\tstatic unsigned version_printed;\n" "-\n" - "-\tif (net_debug && version_printed++ = 0)\n" + "-\tif (net_debug && version_printed++ == 0)\n" "-\t\tprintk(KERN_INFO \"%s\", version);\n" "-}\n" "-static const struct net_device_ops am79c961_netdev_ops = {\n" @@ -825,7 +826,7 @@ "-\tdev->netdev_ops = &am79c961_netdev_ops;\n" "-\n" "-\tret = register_netdev(dev);\n" - "-\tif (ret = 0) {\n" + "-\tif (ret == 0) {\n" "-\t\tprintk(KERN_INFO \"%s: ether address %pM\\n\",\n" "-\t\t dev->name, dev->dev_addr);\n" "-\t\treturn 0;\n" @@ -1004,4 +1005,4 @@ "-- \n" 2.27.0 -69361c02772e2388937d53e07676bf9a3460153e5c363e637180ecb4222cf0dd +99cf07c741ad8c8c8c3f78b4218a9c644e8294dedddb4ddedc84ee587d139141
diff --git a/a/1.txt b/N2/1.txt index 405f989..8c1e4a9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -101,7 +101,8 @@ index 1c53408f5d47..000000000000 - -static unsigned int net_debug = NET_DEBUG; - --static const char version[] - "am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\n"; +-static const char version[] = +- "am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\n"; - -/* --------------------------------------------------------------------------- */ - @@ -244,7 +245,7 @@ index 1c53408f5d47..000000000000 - printk ("%s: buffer error (%02X %02X) %05X - ", dev->name, val, buffer[i], i); - error = 1; - errorcount ++; -- } else if (error && buffer[i] = val) { +- } else if (error && buffer[i] == val) { - printk ("%05X\n", i); - error = 0; - } @@ -456,7 +457,7 @@ index 1c53408f5d47..000000000000 - /* - * Spin waiting for chip to report suspend mode - */ -- while ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) = 0) { +- while ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) == 0) { - spin_unlock_irqrestore(&priv->chip_lock, flags); - nop(); - spin_lock_irqsave(&priv->chip_lock, flags); @@ -712,7 +713,7 @@ index 1c53408f5d47..000000000000 -{ - static unsigned version_printed; - -- if (net_debug && version_printed++ = 0) +- if (net_debug && version_printed++ == 0) - printk(KERN_INFO "%s", version); -} -static const struct net_device_ops am79c961_netdev_ops = { @@ -796,7 +797,7 @@ index 1c53408f5d47..000000000000 - dev->netdev_ops = &am79c961_netdev_ops; - - ret = register_netdev(dev); -- if (ret = 0) { +- if (ret == 0) { - printk(KERN_INFO "%s: ether address %pM\n", - dev->name, dev->dev_addr); - return 0; @@ -974,3 +975,9 @@ index 73679e053ceb..000000000000 -#endif -- 2.27.0 + + +_______________________________________________ +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/N2/content_digest index d2dc52f..79173ce 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,30 +1,30 @@ "ref\020201030151758.1241164-1-arnd@kernel.org\0" "From\0Arnd Bergmann <arnd@kernel.org>\0" "Subject\0[PATCH v2 02/15] net: remove am79c961a driver\0" - "Date\0Fri, 30 Oct 2020 15:17:45 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:45 +0100\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Thomas Gleixner <tglx@linutronix.de>" - Arnd Bergmann <arnd@arndb.de> - Russell King <linux@armlinux.org.uk> - Tony Luck <tony.luck@intel.com> - Fenghua Yu <fenghua.yu@intel.com> - Greg Ungerer <gerg@linux-m68k.org> - Finn Thain <fthain@telegraphics.com.au> - Philip Blundell <philb@gnu.org> - Joshua Thompson <funaho@jurai.org> - Sam Creasey <sammy@sammy.net> + "Cc\0linux-ia64@vger.kernel.org" + Linus Walleij <linus.walleij@linaro.org> James E.J. Bottomley <James.Bottomley@hansenpartnership.com> + Greg Ungerer <gerg@linux-m68k.org> Helge Deller <deller@gmx.de> Daniel Lezcano <daniel.lezcano@linaro.org> - John Stultz <john.stultz@linaro.org> - Stephen Boyd <sboyd@kernel.org> - Linus Walleij <linus.walleij@linaro.org> - linux-ia64@vger.kernel.org - Parisc List <linux-parisc@vger.kernel.org> + Russell King <linux@armlinux.org.uk> + Finn Thain <fthain@telegraphics.com.au> + Jakub Kicinski <kuba@kernel.org> + Sam Creasey <sammy@sammy.net> + Fenghua Yu <fenghua.yu@intel.com> + Arnd Bergmann <arnd@arndb.de> linux-m68k <linux-m68k@lists.linux-m68k.org> + John Stultz <john.stultz@linaro.org> + Thomas Gleixner <tglx@linutronix.de> Linux ARM <linux-arm-kernel@lists.infradead.org> + Tony Luck <tony.luck@intel.com> + Parisc List <linux-parisc@vger.kernel.org> + Stephen Boyd <sboyd@kernel.org> Russell King <rmk+kernel@armlinux.org.uk> - " Jakub Kicinski <kuba@kernel.org>\0" + Philip Blundell <philb@gnu.org> + " Joshua Thompson <funaho@jurai.org>\0" "\00:1\0" "b\0" "From: Arnd Bergmann <arnd@arndb.de>\n" @@ -130,7 +130,8 @@ "-\n" "-static unsigned int net_debug = NET_DEBUG;\n" "-\n" - "-static const char version[] -\t\"am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\\n\";\n" + "-static const char version[] =\n" + "-\t\"am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\\n\";\n" "-\n" "-/* --------------------------------------------------------------------------- */\n" "-\n" @@ -273,7 +274,7 @@ "-\t\t\tprintk (\"%s: buffer error (%02X %02X) %05X - \", dev->name, val, buffer[i], i);\n" "-\t\t\terror = 1;\n" "-\t\t\terrorcount ++;\n" - "-\t\t} else if (error && buffer[i] = val) {\n" + "-\t\t} else if (error && buffer[i] == val) {\n" "-\t\t\tprintk (\"%05X\\n\", i);\n" "-\t\t\terror = 0;\n" "-\t\t}\n" @@ -485,7 +486,7 @@ "-\t\t/*\n" "-\t\t * Spin waiting for chip to report suspend mode\n" "-\t\t */\n" - "-\t\twhile ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) = 0) {\n" + "-\t\twhile ((read_rreg(dev->base_addr, CTRL1) & CTRL1_SPND) == 0) {\n" "-\t\t\tspin_unlock_irqrestore(&priv->chip_lock, flags);\n" "-\t\t\tnop();\n" "-\t\t\tspin_lock_irqsave(&priv->chip_lock, flags);\n" @@ -741,7 +742,7 @@ "-{\n" "-\tstatic unsigned version_printed;\n" "-\n" - "-\tif (net_debug && version_printed++ = 0)\n" + "-\tif (net_debug && version_printed++ == 0)\n" "-\t\tprintk(KERN_INFO \"%s\", version);\n" "-}\n" "-static const struct net_device_ops am79c961_netdev_ops = {\n" @@ -825,7 +826,7 @@ "-\tdev->netdev_ops = &am79c961_netdev_ops;\n" "-\n" "-\tret = register_netdev(dev);\n" - "-\tif (ret = 0) {\n" + "-\tif (ret == 0) {\n" "-\t\tprintk(KERN_INFO \"%s: ether address %pM\\n\",\n" "-\t\t dev->name, dev->dev_addr);\n" "-\t\treturn 0;\n" @@ -1002,6 +1003,12 @@ "-\n" "-#endif\n" "-- \n" - 2.27.0 + "2.27.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -69361c02772e2388937d53e07676bf9a3460153e5c363e637180ecb4222cf0dd +c61f53382369ebc3e09f32be57b9fc960819e5fc7450f92a9b5477c53513a61c
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.