From mboxrd@z Thu Jan 1 00:00:00 1970 From: xerofoify@gmail.com (nick) Date: Wed, 17 Jun 2015 23:10:58 -0400 Subject: [PATCH] xilinx:Remove unused variable num_frag in the function axienet_start_xmit In-Reply-To: <20150617185848.GI2906@xsjsorenbubuntu> References: <1434556362-3748-1-git-send-email-xerofoify@gmail.com> <20150617160730.GE2906@xsjsorenbubuntu> <20150617185848.GI2906@xsjsorenbubuntu> Message-ID: <558236C2.9030009@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2015-06-17 02:58 PM, S?ren Brinkmann wrote: > On Wed, 2015-06-17 at 12:21PM -0400, Nicholas Krause wrote: >> >> >> On June 17, 2015 12:07:30 PM EDT, "S?ren Brinkmann" wrote: >>> On Wed, 2015-06-17 at 11:52AM -0400, Nicholas Krause wrote: >>>> This removes the unused variable num_frag and the setting of it >>>> to the number of fragments from the passed sk_buff pointer by >>>> this function's caller due to this variable never being used >>>> in this particular function and is not declared as global so >>>> setting it for global use in this file is pointless. >>>> >>>> Signed-off-by: Nicholas Krause >>>> --- >>>> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 -- >>>> 1 file changed, 2 deletions(-) >>>> >>>> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c >>> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c >>>> index 28b7e7d..624dce4 100644 >>>> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c >>>> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c >>>> @@ -651,7 +651,6 @@ static inline int >>> axienet_check_tx_bd_space(struct axienet_local *lp, >>>> static int axienet_start_xmit(struct sk_buff *skb, struct net_device >>> *ndev) >>>> { >>>> u32 ii; >>>> - u32 num_frag; >>>> u32 csum_start_off; >>>> u32 csum_index_off; >>>> skb_frag_t *frag; >>>> @@ -659,7 +658,6 @@ static int axienet_start_xmit(struct sk_buff >>> *skb, struct net_device *ndev) >>>> struct axienet_local *lp = netdev_priv(ndev); >>>> struct axidma_bd *cur_p; >>>> >>>> - num_frag = skb_shinfo(skb)->nr_frags; >>>> cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; >>>> >>>> if (axienet_check_tx_bd_space(lp, num_frag)) { >>> >>> It's used right here, isn't it (and further down in this function too)? >>> Does your tree compile with this change? >>> >>> S?ren >> My tree does compile with this change. > > You have to fix your testing process: > CHK include/config/kernel.release > UPD include/config/kernel.release > CHK include/generated/uapi/linux/version.h > CHK include/generated/utsrelease.h > UPD include/generated/utsrelease.h > CHK include/generated/bounds.h > CHK include/generated/timeconst.h > CHK include/generated/asm-offsets.h > CALL scripts/checksyscalls.sh > :1253:2: warning: #warning syscall userfaultfd not implemented [-Wcpp] > CC drivers/net/ethernet/xilinx/xilinx_axienet_main.o > drivers/net/ethernet/xilinx/xilinx_axienet_main.c: In function 'axienet_start_xmit': > drivers/net/ethernet/xilinx/xilinx_axienet_main.c:667:36: error: 'num_frag' undeclared (first use in this function) > if (axienet_check_tx_bd_space(lp, num_frag)) { > ^ > drivers/net/ethernet/xilinx/xilinx_axienet_main.c:667:36: note: each undeclared identifier is reported only once for each function it appears in > scripts/Makefile.build:258: recipe for target 'drivers/net/ethernet/xilinx/xilinx_axienet_main.o' failed > make[1]: *** [drivers/net/ethernet/xilinx/xilinx_axienet_main.o] Error 1 > Makefile:1545: recipe for target 'drivers/net/ethernet/xilinx/xilinx_axienet_main.o' failed > make: *** [drivers/net/ethernet/xilinx/xilinx_axienet_main.o] Error 2 > > NACK for the patch. > > S?ren > Sorry about that as I tried again and it didn't build. Weird issue maybe something with ccache. Nick From mboxrd@z Thu Jan 1 00:00:00 1970 From: nick Subject: Re: [PATCH] xilinx:Remove unused variable num_frag in the function axienet_start_xmit Date: Wed, 17 Jun 2015 23:10:58 -0400 Message-ID: <558236C2.9030009@gmail.com> References: <1434556362-3748-1-git-send-email-xerofoify@gmail.com> <20150617160730.GE2906@xsjsorenbubuntu> <20150617185848.GI2906@xsjsorenbubuntu> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, michal.simek@xilinx.com, anirudh@xilinx.com, John.Linn@xilinx.com, linux-arm-kernel@lists.infradead.org To: =?UTF-8?B?U8O2cmVuIEJyaW5rbWFubg==?= Return-path: In-Reply-To: <20150617185848.GI2906@xsjsorenbubuntu> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: netdev.vger.kernel.org CgpPbiAyMDE1LTA2LTE3IDAyOjU4IFBNLCBTw7ZyZW4gQnJpbmttYW5uIHdyb3RlOgo+IE9uIFdl ZCwgMjAxNS0wNi0xNyBhdCAxMjoyMVBNIC0wNDAwLCBOaWNob2xhcyBLcmF1c2Ugd3JvdGU6Cj4+ Cj4+Cj4+IE9uIEp1bmUgMTcsIDIwMTUgMTI6MDc6MzAgUE0gRURULCAiU8O2cmVuIEJyaW5rbWFu biIgPHNvcmVuLmJyaW5rbWFubkB4aWxpbnguY29tPiB3cm90ZToKPj4+IE9uIFdlZCwgMjAxNS0w Ni0xNyBhdCAxMTo1MkFNIC0wNDAwLCBOaWNob2xhcyBLcmF1c2Ugd3JvdGU6Cj4+Pj4gVGhpcyBy ZW1vdmVzIHRoZSB1bnVzZWQgdmFyaWFibGUgbnVtX2ZyYWcgYW5kIHRoZSBzZXR0aW5nIG9mIGl0 Cj4+Pj4gdG8gdGhlIG51bWJlciBvZiBmcmFnbWVudHMgZnJvbSB0aGUgcGFzc2VkIHNrX2J1ZmYg cG9pbnRlciBieQo+Pj4+IHRoaXMgZnVuY3Rpb24ncyBjYWxsZXIgZHVlIHRvIHRoaXMgdmFyaWFi bGUgbmV2ZXIgYmVpbmcgdXNlZAo+Pj4+IGluIHRoaXMgcGFydGljdWxhciBmdW5jdGlvbiBhbmQg aXMgbm90IGRlY2xhcmVkIGFzICBnbG9iYWwgc28KPj4+PiBzZXR0aW5nIGl0IGZvciBnbG9iYWwg dXNlIGluIHRoaXMgZmlsZSBpcyBwb2ludGxlc3MuCj4+Pj4KPj4+PiBTaWduZWQtb2ZmLWJ5OiBO aWNob2xhcyBLcmF1c2UgPHhlcm9mb2lmeUBnbWFpbC5jb20+Cj4+Pj4gLS0tCj4+Pj4gIGRyaXZl cnMvbmV0L2V0aGVybmV0L3hpbGlueC94aWxpbnhfYXhpZW5ldF9tYWluLmMgfCAyIC0tCj4+Pj4g IDEgZmlsZSBjaGFuZ2VkLCAyIGRlbGV0aW9ucygtKQo+Pj4+Cj4+Pj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvbmV0L2V0aGVybmV0L3hpbGlueC94aWxpbnhfYXhpZW5ldF9tYWluLmMKPj4+IGIvZHJp dmVycy9uZXQvZXRoZXJuZXQveGlsaW54L3hpbGlueF9heGllbmV0X21haW4uYwo+Pj4+IGluZGV4 IDI4YjdlN2QuLjYyNGRjZTQgMTAwNjQ0Cj4+Pj4gLS0tIGEvZHJpdmVycy9uZXQvZXRoZXJuZXQv eGlsaW54L3hpbGlueF9heGllbmV0X21haW4uYwo+Pj4+ICsrKyBiL2RyaXZlcnMvbmV0L2V0aGVy bmV0L3hpbGlueC94aWxpbnhfYXhpZW5ldF9tYWluLmMKPj4+PiBAQCAtNjUxLDcgKzY1MSw2IEBA IHN0YXRpYyBpbmxpbmUgaW50Cj4+PiBheGllbmV0X2NoZWNrX3R4X2JkX3NwYWNlKHN0cnVjdCBh eGllbmV0X2xvY2FsICpscCwKPj4+PiAgc3RhdGljIGludCBheGllbmV0X3N0YXJ0X3htaXQoc3Ry dWN0IHNrX2J1ZmYgKnNrYiwgc3RydWN0IG5ldF9kZXZpY2UKPj4+ICpuZGV2KQo+Pj4+ICB7Cj4+ Pj4gIAl1MzIgaWk7Cj4+Pj4gLQl1MzIgbnVtX2ZyYWc7Cj4+Pj4gIAl1MzIgY3N1bV9zdGFydF9v ZmY7Cj4+Pj4gIAl1MzIgY3N1bV9pbmRleF9vZmY7Cj4+Pj4gIAlza2JfZnJhZ190ICpmcmFnOwo+ Pj4+IEBAIC02NTksNyArNjU4LDYgQEAgc3RhdGljIGludCBheGllbmV0X3N0YXJ0X3htaXQoc3Ry dWN0IHNrX2J1ZmYKPj4+ICpza2IsIHN0cnVjdCBuZXRfZGV2aWNlICpuZGV2KQo+Pj4+ICAJc3Ry dWN0IGF4aWVuZXRfbG9jYWwgKmxwID0gbmV0ZGV2X3ByaXYobmRldik7Cj4+Pj4gIAlzdHJ1Y3Qg YXhpZG1hX2JkICpjdXJfcDsKPj4+PiAgCj4+Pj4gLQludW1fZnJhZyA9IHNrYl9zaGluZm8oc2ti KS0+bnJfZnJhZ3M7Cj4+Pj4gIAljdXJfcCA9ICZscC0+dHhfYmRfdltscC0+dHhfYmRfdGFpbF07 Cj4+Pj4gIAo+Pj4+ICAJaWYgKGF4aWVuZXRfY2hlY2tfdHhfYmRfc3BhY2UobHAsIG51bV9mcmFn KSkgewo+Pj4KPj4+IEl0J3MgdXNlZCByaWdodCBoZXJlLCBpc24ndCBpdCAoYW5kIGZ1cnRoZXIg ZG93biBpbiB0aGlzIGZ1bmN0aW9uIHRvbyk/Cj4+PiBEb2VzIHlvdXIgdHJlZSBjb21waWxlIHdp dGggdGhpcyBjaGFuZ2U/Cj4+Pgo+Pj4gCVPDtnJlbgo+PiBNeSB0cmVlIGRvZXMgY29tcGlsZSB3 aXRoIHRoaXMgY2hhbmdlLiAKPiAKPiBZb3UgaGF2ZSB0byBmaXggeW91ciB0ZXN0aW5nIHByb2Nl c3M6Cj4gICAgIENISyAgICAgaW5jbHVkZS9jb25maWcva2VybmVsLnJlbGVhc2UKPiAgICAgVVBE ICAgICBpbmNsdWRlL2NvbmZpZy9rZXJuZWwucmVsZWFzZQo+ICAgICBDSEsgICAgIGluY2x1ZGUv Z2VuZXJhdGVkL3VhcGkvbGludXgvdmVyc2lvbi5oCj4gICAgIENISyAgICAgaW5jbHVkZS9nZW5l cmF0ZWQvdXRzcmVsZWFzZS5oCj4gICAgIFVQRCAgICAgaW5jbHVkZS9nZW5lcmF0ZWQvdXRzcmVs ZWFzZS5oCj4gICAgIENISyAgICAgaW5jbHVkZS9nZW5lcmF0ZWQvYm91bmRzLmgKPiAgICAgQ0hL ICAgICBpbmNsdWRlL2dlbmVyYXRlZC90aW1lY29uc3QuaAo+ICAgICBDSEsgICAgIGluY2x1ZGUv Z2VuZXJhdGVkL2FzbS1vZmZzZXRzLmgKPiAgICAgQ0FMTCAgICBzY3JpcHRzL2NoZWNrc3lzY2Fs bHMuc2gKPiAgIDxzdGRpbj46MTI1MzoyOiB3YXJuaW5nOiAjd2FybmluZyBzeXNjYWxsIHVzZXJm YXVsdGZkIG5vdCBpbXBsZW1lbnRlZCBbLVdjcHBdCj4gICAgIENDICAgICAgZHJpdmVycy9uZXQv ZXRoZXJuZXQveGlsaW54L3hpbGlueF9heGllbmV0X21haW4ubwo+ICAgZHJpdmVycy9uZXQvZXRo ZXJuZXQveGlsaW54L3hpbGlueF9heGllbmV0X21haW4uYzogSW4gZnVuY3Rpb24gJ2F4aWVuZXRf c3RhcnRfeG1pdCc6Cj4gICBkcml2ZXJzL25ldC9ldGhlcm5ldC94aWxpbngveGlsaW54X2F4aWVu ZXRfbWFpbi5jOjY2NzozNjogZXJyb3I6ICdudW1fZnJhZycgdW5kZWNsYXJlZCAoZmlyc3QgdXNl IGluIHRoaXMgZnVuY3Rpb24pCj4gICAgIGlmIChheGllbmV0X2NoZWNrX3R4X2JkX3NwYWNlKGxw LCBudW1fZnJhZykpIHsKPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF4K PiAgIGRyaXZlcnMvbmV0L2V0aGVybmV0L3hpbGlueC94aWxpbnhfYXhpZW5ldF9tYWluLmM6NjY3 OjM2OiBub3RlOiBlYWNoIHVuZGVjbGFyZWQgaWRlbnRpZmllciBpcyByZXBvcnRlZCBvbmx5IG9u Y2UgZm9yIGVhY2ggZnVuY3Rpb24gaXQgYXBwZWFycyBpbgo+ICAgc2NyaXB0cy9NYWtlZmlsZS5i dWlsZDoyNTg6IHJlY2lwZSBmb3IgdGFyZ2V0ICdkcml2ZXJzL25ldC9ldGhlcm5ldC94aWxpbngv eGlsaW54X2F4aWVuZXRfbWFpbi5vJyBmYWlsZWQKPiAgIG1ha2VbMV06ICoqKiBbZHJpdmVycy9u ZXQvZXRoZXJuZXQveGlsaW54L3hpbGlueF9heGllbmV0X21haW4ub10gRXJyb3IgMQo+ICAgTWFr ZWZpbGU6MTU0NTogcmVjaXBlIGZvciB0YXJnZXQgJ2RyaXZlcnMvbmV0L2V0aGVybmV0L3hpbGlu eC94aWxpbnhfYXhpZW5ldF9tYWluLm8nIGZhaWxlZAo+ICAgbWFrZTogKioqIFtkcml2ZXJzL25l dC9ldGhlcm5ldC94aWxpbngveGlsaW54X2F4aWVuZXRfbWFpbi5vXSBFcnJvciAyCj4gCj4gTkFD SyBmb3IgdGhlIHBhdGNoLgo+IAo+IAlTw7ZyZW4KPiAKU29ycnkgYWJvdXQgdGhhdCBhcyBJIHRy aWVkIGFnYWluIGFuZCBpdCBkaWRuJ3QgYnVpbGQuIFdlaXJkIGlzc3VlIG1heWJlIHNvbWV0aGlu ZyB3aXRoIGNjYWNoZS4KTmljawoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5l bEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=