diff for duplicates of <4D75E1DE.3030408@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 145ea62..324f588 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -238,7 +238,7 @@ index 095e525..51268f5 100644 @@ -513,9 +499,9 @@ static void sh_eth_ring_format(struct net_device *ndev) rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16); /* Rx descriptor address set */ - if (i = 0) { + if (i == 0) { - writel(mdp->rx_desc_dma, ioaddr + RDLAR); + sh_eth_write(ndev, mdp->rx_desc_dma, RDLAR); #if defined(CONFIG_CPU_SUBTYPE_SH7763) @@ -249,7 +249,7 @@ index 095e525..51268f5 100644 } @@ -535,9 +521,9 @@ static void sh_eth_ring_format(struct net_device *ndev) txdesc->buffer_length = 0; - if (i = 0) { + if (i == 0) { /* Tx descriptor address set */ - writel(mdp->tx_desc_dma, ioaddr + TDLAR); + sh_eth_write(ndev, mdp->tx_desc_dma, TDLAR); @@ -505,7 +505,7 @@ index 095e525..51268f5 100644 @@ -1039,8 +1021,8 @@ static void sh_eth_adjust_link(struct net_device *ndev) mdp->cd->set_rate(ndev); } - if (mdp->link = PHY_DOWN) { + if (mdp->link == PHY_DOWN) { - writel((readl(ioaddr + ECMR) & ~ECMR_TXF) - | ECMR_DM, ioaddr + ECMR); + sh_eth_write(ndev, (sh_eth_read(ndev, ECMR) & ~ECMR_TXF) diff --git a/a/content_digest b/N1/content_digest index 729a8ac..7918061 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0[PATCH v2 1/6] net: sh_eth: modify the definitions of register\0" - "Date\0Tue, 08 Mar 2011 07:59:26 +0000\0" + "Date\0Tue, 08 Mar 2011 16:59:26 +0900\0" "To\0netdev@vger.kernel.org\0" "Cc\0SH-Linux <linux-sh@vger.kernel.org>\0" "\00:1\0" @@ -245,7 +245,7 @@ "@@ -513,9 +499,9 @@ static void sh_eth_ring_format(struct net_device *ndev)\n" " \t\trxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);\n" " \t\t/* Rx descriptor address set */\n" - " \t\tif (i = 0) {\n" + " \t\tif (i == 0) {\n" "-\t\t\twritel(mdp->rx_desc_dma, ioaddr + RDLAR);\n" "+\t\t\tsh_eth_write(ndev, mdp->rx_desc_dma, RDLAR);\n" " #if defined(CONFIG_CPU_SUBTYPE_SH7763)\n" @@ -256,7 +256,7 @@ " \t}\n" "@@ -535,9 +521,9 @@ static void sh_eth_ring_format(struct net_device *ndev)\n" " \t\ttxdesc->buffer_length = 0;\n" - " \t\tif (i = 0) {\n" + " \t\tif (i == 0) {\n" " \t\t\t/* Tx descriptor address set */\n" "-\t\t\twritel(mdp->tx_desc_dma, ioaddr + TDLAR);\n" "+\t\t\tsh_eth_write(ndev, mdp->tx_desc_dma, TDLAR);\n" @@ -512,7 +512,7 @@ "@@ -1039,8 +1021,8 @@ static void sh_eth_adjust_link(struct net_device *ndev)\n" " \t\t\t\tmdp->cd->set_rate(ndev);\n" " \t\t}\n" - " \t\tif (mdp->link = PHY_DOWN) {\n" + " \t\tif (mdp->link == PHY_DOWN) {\n" "-\t\t\twritel((readl(ioaddr + ECMR) & ~ECMR_TXF)\n" "-\t\t\t\t\t| ECMR_DM, ioaddr + ECMR);\n" "+\t\t\tsh_eth_write(ndev, (sh_eth_read(ndev, ECMR) & ~ECMR_TXF)\n" @@ -1429,4 +1429,4 @@ "-- \n" 1.7.1 -19220feb6d06035798219fc23773530673a60b1c2ad7a6d0f6f9f560a485556e +d81816874c792ba1c230b87a8c99e0e729e6fee54f68aa223872fdf10d2dd2f6
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.