diff for duplicates of <20201218184347.2180772-10-sam@ravnborg.org>
diff --git a/a/1.txt b/N1/1.txt
index cd36e99..13565d7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -581,13 +581,13 @@ index 87bdcb16019b..000000000000
-
- node = prom_getchild (prom_root_node);
- node = prom_searchsiblings (node, "pci");
-- if (node == 0)
+- if (node = 0)
- return -ENODEV;
- /*
- * Map in PCIC register set, config space, and IO base
- */
- err = prom_getproperty(node, "reg", (char*)regs, sizeof(regs));
-- if (err == 0 || err == -1) {
+- if (err = 0 || err = -1) {
- prom_printf("PCIC: Error, cannot get PCIC registers "
- "from PROM.\n");
- prom_halt();
@@ -604,14 +604,13 @@ index 87bdcb16019b..000000000000
-
- pcic->pcic_res_io.name = "pcic_io";
- if ((pcic->pcic_io = (unsigned long)
-- ioremap(regs[1].phys_addr, 0x10000)) == 0) {
+- ioremap(regs[1].phys_addr, 0x10000)) = 0) {
- prom_printf("PCIC: Error, cannot map PCIC IO Base.\n");
- prom_halt();
- }
-
- pcic->pcic_res_cfg_addr.name = "pcic_cfg_addr";
-- if ((pcic->pcic_config_space_addr =
-- ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == NULL) {
+- if ((pcic->pcic_config_space_addr - ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) = NULL) {
- prom_printf("PCIC: Error, cannot map "
- "PCI Configuration Space Address.\n");
- prom_halt();
@@ -622,8 +621,7 @@ index 87bdcb16019b..000000000000
- * must be the same. Thus, we need adjust size of data.
- */
- pcic->pcic_res_cfg_data.name = "pcic_cfg_data";
-- if ((pcic->pcic_config_space_data =
-- ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == NULL) {
+- if ((pcic->pcic_config_space_data - ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) = NULL) {
- prom_printf("PCIC: Error, cannot map "
- "PCI Configuration Space Data.\n");
- prom_halt();
@@ -639,13 +637,13 @@ index 87bdcb16019b..000000000000
- struct pcic_sn2list *p;
-
- for (p = pcic_known_sysnames; p->sysname != NULL; p++) {
-- if (strcmp(namebuf, p->sysname) == 0)
+- if (strcmp(namebuf, p->sysname) = 0)
- break;
- }
- pcic->pcic_imap = p->intmap;
- pcic->pcic_imdim = p->mapdim;
- }
-- if (pcic->pcic_imap == NULL) {
+- if (pcic->pcic_imap = NULL) {
- /*
- * We do not panic here for the sake of embedded systems.
- */
@@ -724,7 +722,7 @@ index 87bdcb16019b..000000000000
- (char *)®s[0], sizeof(regs));
- if(err != 0 && err != -1) {
- unsigned long devfn = (regs[0].which_io >> 8) & 0xff;
-- if(devfn == pdev->devfn)
+- if(devfn = pdev->devfn)
- return node;
- }
- node = prom_getsibling(node);
@@ -745,7 +743,7 @@ index 87bdcb16019b..000000000000
- unsigned long flags;
- int j;
-
-- if (node == 0 || node == -1) {
+- if (node = 0 || node = -1) {
- strcpy(namebuf, "???");
- } else {
- prom_getstring(node, "name", namebuf, 63); namebuf[63] = 0;
@@ -753,7 +751,7 @@ index 87bdcb16019b..000000000000
-
- for (j = 0; j < 6; j++) {
- address = dev->resource[j].start;
-- if (address == 0) break; /* are sequential */
+- if (address = 0) break; /* are sequential */
- flags = dev->resource[j].flags;
- if ((flags & IORESOURCE_IO) != 0) {
- if (address < 0x10000) {
@@ -774,11 +772,9 @@ index 87bdcb16019b..000000000000
- * What if we want to allocate one more
- * PCI base address...
- */
-- dev->resource[j].start =
-- pcic->pcic_io + address;
+- dev->resource[j].start - pcic->pcic_io + address;
- dev->resource[j].end = 1; /* XXX */
-- dev->resource[j].flags =
-- (flags & ~IORESOURCE_IO) | IORESOURCE_MEM;
+- dev->resource[j].flags - (flags & ~IORESOURCE_IO) | IORESOURCE_MEM;
- } else {
- /*
- * OOPS... PCI Spec allows this. Sun does
@@ -804,18 +800,18 @@ index 87bdcb16019b..000000000000
- int i, ivec;
- char namebuf[64];
-
-- if (node == 0 || node == -1) {
+- if (node = 0 || node = -1) {
- strcpy(namebuf, "???");
- } else {
- prom_getstring(node, "name", namebuf, sizeof(namebuf));
- }
-
-- if ((p = pcic->pcic_imap) == NULL) {
+- if ((p = pcic->pcic_imap) = NULL) {
- dev->irq = 0;
- return;
- }
- for (i = 0; i < pcic->pcic_imdim; i++) {
-- if (p->busno == dev->bus->number && p->devfn == dev->devfn)
+- if (p->busno = dev->bus->number && p->devfn = dev->devfn)
- break;
- p++;
- }
@@ -841,8 +837,8 @@ index 87bdcb16019b..000000000000
- /* real_irq means PROM did not bother to program the upper
- * half of PCIC. This happens on JS-E with PROM 3.11, for instance.
- */
-- if (real_irq == 0 || p->force) {
-- if (p->irq == 0 || p->irq >= 15) { /* Corrupted map */
+- if (real_irq = 0 || p->force) {
+- if (p->irq = 0 || p->irq >= 15) { /* Corrupted map */
- pci_info(dev, "PCIC: BAD IRQ %d\n", p->irq); for (;;) {}
- }
- pci_info(dev, "PCIC: setting irq %d at pin %d\n", p->irq,
@@ -893,7 +889,7 @@ index 87bdcb16019b..000000000000
-
- list_for_each_entry(dev, &bus->devices, bus_list) {
- node = pdev_to_pnode(&pcic->pbm, dev);
-- if(node == 0)
+- if(node = 0)
- node = -1;
-
- /* cookies */
@@ -1017,7 +1013,7 @@ index 87bdcb16019b..000000000000
-{
- pend = swab32(pend);
-
-- if (!pcic_speculative || (pend & PCI_SYS_INT_PENDING_PIO) == 0) {
+- if (!pcic_speculative || (pend & PCI_SYS_INT_PENDING_PIO) = 0) {
- /*
- * XXX On CP-1200 PCI #SERR may happen, we do not know
- * what to do about it yet.
@@ -1079,11 +1075,11 @@ index 87bdcb16019b..000000000000
-
- irq = 0;
- mask = get_irqmask(real_irq);
-- if (mask == 0)
+- if (mask = 0)
- goto out;
-
- irq = irq_alloc(real_irq, real_irq);
-- if (irq == 0)
+- if (irq = 0)
- goto out;
-
- irq_set_chip_and_handler_name(irq, &pcic_irq,
diff --git a/a/content_digest b/N1/content_digest
index 29c9390..9565860 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v1 09/13] sparc32: Drop pcic support\0"
]
[
- "Date\0Fri, 18 Dec 2020 19:43:43 +0100\0"
+ "Date\0Fri, 18 Dec 2020 18:43:43 +0000\0"
]
[
"To\0David S Miller <davem\@davemloft.net>",
@@ -632,13 +632,13 @@
"-\n",
"-\tnode = prom_getchild (prom_root_node);\n",
"-\tnode = prom_searchsiblings (node, \"pci\");\n",
- "-\tif (node == 0)\n",
+ "-\tif (node = 0)\n",
"-\t\treturn -ENODEV;\n",
"-\t/*\n",
"-\t * Map in PCIC register set, config space, and IO base\n",
"-\t */\n",
"-\terr = prom_getproperty(node, \"reg\", (char*)regs, sizeof(regs));\n",
- "-\tif (err == 0 || err == -1) {\n",
+ "-\tif (err = 0 || err = -1) {\n",
"-\t\tprom_printf(\"PCIC: Error, cannot get PCIC registers \"\n",
"-\t\t\t \"from PROM.\\n\");\n",
"-\t\tprom_halt();\n",
@@ -655,14 +655,13 @@
"-\n",
"-\tpcic->pcic_res_io.name = \"pcic_io\";\n",
"-\tif ((pcic->pcic_io = (unsigned long)\n",
- "-\t ioremap(regs[1].phys_addr, 0x10000)) == 0) {\n",
+ "-\t ioremap(regs[1].phys_addr, 0x10000)) = 0) {\n",
"-\t\tprom_printf(\"PCIC: Error, cannot map PCIC IO Base.\\n\");\n",
"-\t\tprom_halt();\n",
"-\t}\n",
"-\n",
"-\tpcic->pcic_res_cfg_addr.name = \"pcic_cfg_addr\";\n",
- "-\tif ((pcic->pcic_config_space_addr =\n",
- "-\t ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == NULL) {\n",
+ "-\tif ((pcic->pcic_config_space_addr -\t ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) = NULL) {\n",
"-\t\tprom_printf(\"PCIC: Error, cannot map \"\n",
"-\t\t\t \"PCI Configuration Space Address.\\n\");\n",
"-\t\tprom_halt();\n",
@@ -673,8 +672,7 @@
"-\t * must be the same. Thus, we need adjust size of data.\n",
"-\t */\n",
"-\tpcic->pcic_res_cfg_data.name = \"pcic_cfg_data\";\n",
- "-\tif ((pcic->pcic_config_space_data =\n",
- "-\t ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == NULL) {\n",
+ "-\tif ((pcic->pcic_config_space_data -\t ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) = NULL) {\n",
"-\t\tprom_printf(\"PCIC: Error, cannot map \"\n",
"-\t\t\t \"PCI Configuration Space Data.\\n\");\n",
"-\t\tprom_halt();\n",
@@ -690,13 +688,13 @@
"-\t\tstruct pcic_sn2list *p;\n",
"-\n",
"-\t\tfor (p = pcic_known_sysnames; p->sysname != NULL; p++) {\n",
- "-\t\t\tif (strcmp(namebuf, p->sysname) == 0)\n",
+ "-\t\t\tif (strcmp(namebuf, p->sysname) = 0)\n",
"-\t\t\t\tbreak;\n",
"-\t\t}\n",
"-\t\tpcic->pcic_imap = p->intmap;\n",
"-\t\tpcic->pcic_imdim = p->mapdim;\n",
"-\t}\n",
- "-\tif (pcic->pcic_imap == NULL) {\n",
+ "-\tif (pcic->pcic_imap = NULL) {\n",
"-\t\t/*\n",
"-\t\t * We do not panic here for the sake of embedded systems.\n",
"-\t\t */\n",
@@ -775,7 +773,7 @@
"-\t\t\t\t (char *)®s[0], sizeof(regs));\n",
"-\t\tif(err != 0 && err != -1) {\n",
"-\t\t\tunsigned long devfn = (regs[0].which_io >> 8) & 0xff;\n",
- "-\t\t\tif(devfn == pdev->devfn)\n",
+ "-\t\t\tif(devfn = pdev->devfn)\n",
"-\t\t\t\treturn node;\n",
"-\t\t}\n",
"-\t\tnode = prom_getsibling(node);\n",
@@ -796,7 +794,7 @@
"-\tunsigned long flags;\n",
"-\tint j;\n",
"-\n",
- "-\tif (node == 0 || node == -1) {\n",
+ "-\tif (node = 0 || node = -1) {\n",
"-\t\tstrcpy(namebuf, \"???\");\n",
"-\t} else {\n",
"-\t\tprom_getstring(node, \"name\", namebuf, 63); namebuf[63] = 0;\n",
@@ -804,7 +802,7 @@
"-\n",
"-\tfor (j = 0; j < 6; j++) {\n",
"-\t\taddress = dev->resource[j].start;\n",
- "-\t\tif (address == 0) break;\t/* are sequential */\n",
+ "-\t\tif (address = 0) break;\t/* are sequential */\n",
"-\t\tflags = dev->resource[j].flags;\n",
"-\t\tif ((flags & IORESOURCE_IO) != 0) {\n",
"-\t\t\tif (address < 0x10000) {\n",
@@ -825,11 +823,9 @@
"-\t\t\t\t * What if we want to allocate one more\n",
"-\t\t\t\t * PCI base address...\n",
"-\t\t\t\t */\n",
- "-\t\t\t\tdev->resource[j].start =\n",
- "-\t\t\t\t pcic->pcic_io + address;\n",
+ "-\t\t\t\tdev->resource[j].start -\t\t\t\t pcic->pcic_io + address;\n",
"-\t\t\t\tdev->resource[j].end = 1; /* XXX */\n",
- "-\t\t\t\tdev->resource[j].flags =\n",
- "-\t\t\t\t (flags & ~IORESOURCE_IO) | IORESOURCE_MEM;\n",
+ "-\t\t\t\tdev->resource[j].flags -\t\t\t\t (flags & ~IORESOURCE_IO) | IORESOURCE_MEM;\n",
"-\t\t\t} else {\n",
"-\t\t\t\t/*\n",
"-\t\t\t\t * OOPS... PCI Spec allows this. Sun does\n",
@@ -855,18 +851,18 @@
"-\tint i, ivec;\n",
"-\tchar namebuf[64];\n",
"-\n",
- "-\tif (node == 0 || node == -1) {\n",
+ "-\tif (node = 0 || node = -1) {\n",
"-\t\tstrcpy(namebuf, \"???\");\n",
"-\t} else {\n",
"-\t\tprom_getstring(node, \"name\", namebuf, sizeof(namebuf));\n",
"-\t}\n",
"-\n",
- "-\tif ((p = pcic->pcic_imap) == NULL) {\n",
+ "-\tif ((p = pcic->pcic_imap) = NULL) {\n",
"-\t\tdev->irq = 0;\n",
"-\t\treturn;\n",
"-\t}\n",
"-\tfor (i = 0; i < pcic->pcic_imdim; i++) {\n",
- "-\t\tif (p->busno == dev->bus->number && p->devfn == dev->devfn)\n",
+ "-\t\tif (p->busno = dev->bus->number && p->devfn = dev->devfn)\n",
"-\t\t\tbreak;\n",
"-\t\tp++;\n",
"-\t}\n",
@@ -892,8 +888,8 @@
"-\t/* real_irq means PROM did not bother to program the upper\n",
"-\t * half of PCIC. This happens on JS-E with PROM 3.11, for instance.\n",
"-\t */\n",
- "-\tif (real_irq == 0 || p->force) {\n",
- "-\t\tif (p->irq == 0 || p->irq >= 15) {\t/* Corrupted map */\n",
+ "-\tif (real_irq = 0 || p->force) {\n",
+ "-\t\tif (p->irq = 0 || p->irq >= 15) {\t/* Corrupted map */\n",
"-\t\t\tpci_info(dev, \"PCIC: BAD IRQ %d\\n\", p->irq); for (;;) {}\n",
"-\t\t}\n",
"-\t\tpci_info(dev, \"PCIC: setting irq %d at pin %d\\n\", p->irq,\n",
@@ -944,7 +940,7 @@
"-\n",
"-\tlist_for_each_entry(dev, &bus->devices, bus_list) {\n",
"-\t\tnode = pdev_to_pnode(&pcic->pbm, dev);\n",
- "-\t\tif(node == 0)\n",
+ "-\t\tif(node = 0)\n",
"-\t\t\tnode = -1;\n",
"-\n",
"-\t\t/* cookies */\n",
@@ -1068,7 +1064,7 @@
"-{\n",
"-\tpend = swab32(pend);\n",
"-\n",
- "-\tif (!pcic_speculative || (pend & PCI_SYS_INT_PENDING_PIO) == 0) {\n",
+ "-\tif (!pcic_speculative || (pend & PCI_SYS_INT_PENDING_PIO) = 0) {\n",
"-\t\t/*\n",
"-\t\t * XXX On CP-1200 PCI #SERR may happen, we do not know\n",
"-\t\t * what to do about it yet.\n",
@@ -1130,11 +1126,11 @@
"-\n",
"-\tirq = 0;\n",
"-\tmask = get_irqmask(real_irq);\n",
- "-\tif (mask == 0)\n",
+ "-\tif (mask = 0)\n",
"-\t\tgoto out;\n",
"-\n",
"-\tirq = irq_alloc(real_irq, real_irq);\n",
- "-\tif (irq == 0)\n",
+ "-\tif (irq = 0)\n",
"-\t\tgoto out;\n",
"-\n",
"-\tirq_set_chip_and_handler_name(irq, &pcic_irq,\n",
@@ -1186,4 +1182,4 @@
"2.27.0"
]
-452b5254a42e77d87d846f6c4b36bd7741d28af7d4119490a617305fff7dad66
+d320834b387c1b7670818043f4505f23aef66cda6ada55e70f47f443d26e67b9
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.