| Message ID | alpine.LFD.2.03.1309222113300.16797@linux-mips.org |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "Maciej W. Rozycki" <macro@linux-mips.org> Date: Sun, 22 Sep 2013 21:19:01 +0100 (BST) > Revert damage caused by 43d620c82985b19008d87a437b4cf83f356264f7 > [drivers/net: Remove casts of void *]: > > .../declance.c: In function 'cp_to_buf': > .../declance.c:347: warning: assignment from incompatible pointer type > .../declance.c:348: warning: assignment from incompatible pointer type > .../declance.c: In function 'cp_from_buf': > .../declance.c:406: warning: assignment from incompatible pointer type > .../declance.c:407: warning: assignment from incompatible pointer type > > Also add a `const' qualifier where applicable and adjust formatting. > > Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> > --- >> Applied to net-next > > Thanks, by Sergei's request please use this version instead that has the > reference to the original commit updated (no change to the patch itself). I can't undo the original commit once it has been installed in my tree. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 28 Sep 2013, David Miller wrote: > > Thanks, by Sergei's request please use this version instead that has the > > reference to the original commit updated (no change to the patch itself). > > I can't undo the original commit once it has been installed in my tree. No worries, and good to know, thanks. Maciej -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-mips-3.12.0-rc1-20130917-4maxp/drivers/net/ethernet/amd/declance.c =================================================================== --- linux-mips-3.12.0-rc1-20130917-4maxp.orig/drivers/net/ethernet/amd/declance.c +++ linux-mips-3.12.0-rc1-20130917-4maxp/drivers/net/ethernet/amd/declance.c @@ -344,8 +344,8 @@ static void cp_to_buf(const int type, vo } clen = len & 1; - rtp = tp; - rfp = fp; + rtp = (unsigned char *)tp; + rfp = (const unsigned char *)fp; while (clen--) { *rtp++ = *rfp++; } @@ -372,8 +372,8 @@ static void cp_to_buf(const int type, vo * do the rest, if any. */ clen = len & 15; - rtp = (unsigned char *) tp; - rfp = (unsigned char *) fp; + rtp = (unsigned char *)tp; + rfp = (const unsigned char *)fp; while (clen--) { *rtp++ = *rfp++; } @@ -403,8 +403,8 @@ static void cp_from_buf(const int type, clen = len & 1; - rtp = tp; - rfp = fp; + rtp = (unsigned char *)tp; + rfp = (const unsigned char *)fp; while (clen--) { *rtp++ = *rfp++; @@ -433,8 +433,8 @@ static void cp_from_buf(const int type, * do the rest, if any. */ clen = len & 15; - rtp = (unsigned char *) tp; - rfp = (unsigned char *) fp; + rtp = (unsigned char *)tp; + rfp = (const unsigned char *)fp; while (clen--) { *rtp++ = *rfp++; }