diff for duplicates of <20140505085305.GA17365@mwanda> diff --git a/a/1.txt b/N1/1.txt index c92edd1..6c10c54 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,7 +86,8 @@ index 414dbf6..fc9f9d0 100644 while (z1 >= 4) { -#ifdef HISAX_HFC4S8S_PCIMEM -- *((unsigned long *) cp) - Read_hfc32(l1p->hw, A_FIFO_DATA0); +- *((unsigned long *) cp) = +- Read_hfc32(l1p->hw, A_FIFO_DATA0); -#else *((unsigned long *) cp) = fRead_hfc32(l1p->hw); -#endif @@ -114,9 +115,11 @@ index 414dbf6..fc9f9d0 100644 while (z1 >= 4) { -#ifdef HISAX_HFC4S8S_PCIMEM -- *((unsigned long *) bch->rx_ptr) - Read_hfc32(l1->hw, A_FIFO_DATA0); +- *((unsigned long *) bch->rx_ptr) = +- Read_hfc32(l1->hw, A_FIFO_DATA0); -#else - *((unsigned long *) bch->rx_ptr) fRead_hfc32(l1->hw); + *((unsigned long *) bch->rx_ptr) = + fRead_hfc32(l1->hw); -#endif bch->rx_ptr += 4; z1 -= 4; @@ -189,7 +192,7 @@ index 414dbf6..fc9f9d0 100644 + fWrite_hfc8(l1->hw, *cp++); if (bch->tx_cnt >= skb->len) { - if (bch->mode = L1_MODE_HDLC) { + if (bch->mode == L1_MODE_HDLC) { @@ -1281,10 +1204,8 @@ hfc4s8s_interrupt(int intno, void *dev_id) if (!hw || !(hw->mr.r_irq_ctrl & M_GLOB_IRQ_EN)) return IRQ_NONE; @@ -200,7 +203,8 @@ index 414dbf6..fc9f9d0 100644 -#endif /* Layer 1 State change */ - hw->mr.r_irq_statech |@@ -1292,9 +1213,7 @@ hfc4s8s_interrupt(int intno, void *dev_id) + hw->mr.r_irq_statech |= +@@ -1292,9 +1213,7 @@ hfc4s8s_interrupt(int intno, void *dev_id) if (! (b = (Read_hfc8(hw, R_STATUS) & (M_MISC_IRQSTA | M_FR_IRQSTA))) && !hw->mr.r_irq_statech) { diff --git a/a/content_digest b/N1/content_digest index d01af0b..48c0627 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\053668DFC.6040106@bfs.de\0" "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch v] isdn: hisax: remove some dead code\0" - "Date\0Mon, 05 May 2014 08:53:05 +0000\0" + "Date\0Mon, 5 May 2014 11:53:05 +0300\0" "To\0Karsten Keil <isdn@linux-pingi.de>\0" "Cc\0Jiri Kosina <jkosina@suse.cz>" Randy Dunlap <rdunlap@infradead.org> @@ -99,7 +99,8 @@ " \n" " \t\twhile (z1 >= 4) {\n" "-#ifdef HISAX_HFC4S8S_PCIMEM\n" - "-\t\t\t*((unsigned long *) cp) -\t\t\t\tRead_hfc32(l1p->hw, A_FIFO_DATA0);\n" + "-\t\t\t*((unsigned long *) cp) =\n" + "-\t\t\t\tRead_hfc32(l1p->hw, A_FIFO_DATA0);\n" "-#else\n" " \t\t\t*((unsigned long *) cp) = fRead_hfc32(l1p->hw);\n" "-#endif\n" @@ -127,9 +128,11 @@ " \n" " \t\twhile (z1 >= 4) {\n" "-#ifdef HISAX_HFC4S8S_PCIMEM\n" - "-\t\t\t*((unsigned long *) bch->rx_ptr) -\t\t\t\tRead_hfc32(l1->hw, A_FIFO_DATA0);\n" + "-\t\t\t*((unsigned long *) bch->rx_ptr) =\n" + "-\t\t\t\tRead_hfc32(l1->hw, A_FIFO_DATA0);\n" "-#else\n" - " \t\t\t*((unsigned long *) bch->rx_ptr) \t\t\t\tfRead_hfc32(l1->hw);\n" + " \t\t\t*((unsigned long *) bch->rx_ptr) =\n" + " \t\t\t\tfRead_hfc32(l1->hw);\n" "-#endif\n" " \t\t\tbch->rx_ptr += 4;\n" " \t\t\tz1 -= 4;\n" @@ -202,7 +205,7 @@ "+\t\t\tfWrite_hfc8(l1->hw, *cp++);\n" " \n" " \t\tif (bch->tx_cnt >= skb->len) {\n" - " \t\t\tif (bch->mode = L1_MODE_HDLC) {\n" + " \t\t\tif (bch->mode == L1_MODE_HDLC) {\n" "@@ -1281,10 +1204,8 @@ hfc4s8s_interrupt(int intno, void *dev_id)\n" " \tif (!hw || !(hw->mr.r_irq_ctrl & M_GLOB_IRQ_EN))\n" " \t\treturn IRQ_NONE;\n" @@ -213,7 +216,8 @@ "-#endif\n" " \n" " \t/* Layer 1 State change */\n" - " \thw->mr.r_irq_statech |@@ -1292,9 +1213,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)\n" + " \thw->mr.r_irq_statech |=\n" + "@@ -1292,9 +1213,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)\n" " \tif (!\n" " \t (b = (Read_hfc8(hw, R_STATUS) & (M_MISC_IRQSTA | M_FR_IRQSTA)))\n" " \t && !hw->mr.r_irq_statech) {\n" @@ -294,4 +298,4 @@ " \tpci_set_drvdata(pdev, hw);\n" " \terr = setup_instance(hw);" -83b5240f26abc755e75526ffb06d27653984301fc56f8d73eee53f4843dccb3a +11806fdb2f19f8b219df3867387b8ce443ffdbf985ed7e6c90811bbdb00c408c
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.