From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Hovold Date: Sun, 30 Sep 2018 16:02:24 +0000 Subject: Re: [PATCH -next] USB: cypress_m8: remove set but not used variables 'actual_size, iflag' Message-Id: <20180930160224.GG3332@localhost> List-Id: References: <1538214843-182555-1-git-send-email-yuehaibing@huawei.com> In-Reply-To: <1538214843-182555-1-git-send-email-yuehaibing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: YueHaibing Cc: Johan Hovold , Greg Kroah-Hartman , linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org On Sat, Sep 29, 2018 at 09:54:03AM +0000, YueHaibing wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/usb/serial/cypress_m8.c: In function 'cypress_send': > drivers/usb/serial/cypress_m8.c:689:33: warning: > variable 'actual_size' set but not used [-Wunused-but-set-variable] > > drivers/usb/serial/cypress_m8.c: In function 'cypress_set_termios': > drivers/usb/serial/cypress_m8.c:866:18: warning: > variable 'iflag' set but not used [-Wunused-but-set-variable] > > Signed-off-by: YueHaibing > --- > drivers/usb/serial/cypress_m8.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c > index 31c6091..98dff12 100644 > --- a/drivers/usb/serial/cypress_m8.c > +++ b/drivers/usb/serial/cypress_m8.c > @@ -686,7 +686,7 @@ static int cypress_write(struct tty_struct *tty, struct usb_serial_port *port, > > static void cypress_send(struct usb_serial_port *port) > { > - int count = 0, result, offset, actual_size; > + int count = 0, result, offset; > struct cypress_private *priv = usb_get_serial_port_data(port); > struct device *dev = &port->dev; > unsigned long flags; > @@ -758,12 +758,6 @@ static void cypress_send(struct usb_serial_port *port) > priv->write_urb_in_use = 1; > spin_unlock_irqrestore(&priv->lock, flags); > > - if (priv->cmd_ctrl) > - actual_size = 1; > - else > - actual_size = count + > - (priv->pkt_fmt = packet_format_1 ? 2 : 1); > - This looks like we have a bug in the driver, and sure enough we do. Commit 9aa8dae7b1fa ("cypress_m8: use usb_fill_int_urb where appropriate") incorrectly started setting the transfer length to the size of the buffer. I've prepared a fix to this. > usb_serial_debug_data(dev, __func__, port->interrupt_out_size, > port->interrupt_out_urb->transfer_buffer); > > @@ -863,7 +857,7 @@ static void cypress_set_termios(struct tty_struct *tty, > struct cypress_private *priv = usb_get_serial_port_data(port); > struct device *dev = &port->dev; > int data_bits, stop_bits, parity_type, parity_enable; > - unsigned cflag, iflag; > + unsigned int cflag; > unsigned long flags; > __u8 oldlines; > int linechange = 0; > @@ -899,7 +893,6 @@ static void cypress_set_termios(struct tty_struct *tty, > tty->termios.c_cflag &= ~(CMSPAR|CRTSCTS); > > cflag = tty->termios.c_cflag; > - iflag = tty->termios.c_iflag; > > /* check if there are new settings */ > if (old_termios) { Would you mind resending just this chunk as a v2? Thanks, Johan From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [-next] USB: cypress_m8: remove set but not used variables 'actual_size, iflag' From: Johan Hovold Message-Id: <20180930160224.GG3332@localhost> Date: Sun, 30 Sep 2018 18:02:24 +0200 To: YueHaibing Cc: Johan Hovold , Greg Kroah-Hartman , linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org List-ID: T24gU2F0LCBTZXAgMjksIDIwMTggYXQgMDk6NTQ6MDNBTSArMDAwMCwgWXVlSGFpYmluZyB3cm90 ZToKPiBGaXhlcyBnY2MgJy1XdW51c2VkLWJ1dC1zZXQtdmFyaWFibGUnIHdhcm5pbmc6Cj4gCj4g ZHJpdmVycy91c2Ivc2VyaWFsL2N5cHJlc3NfbTguYzogSW4gZnVuY3Rpb24gJ2N5cHJlc3Nfc2Vu ZCc6Cj4gZHJpdmVycy91c2Ivc2VyaWFsL2N5cHJlc3NfbTguYzo2ODk6MzM6IHdhcm5pbmc6Cj4g IHZhcmlhYmxlICdhY3R1YWxfc2l6ZScgc2V0IGJ1dCBub3QgdXNlZCBbLVd1bnVzZWQtYnV0LXNl dC12YXJpYWJsZV0KPiAKPiBkcml2ZXJzL3VzYi9zZXJpYWwvY3lwcmVzc19tOC5jOiBJbiBmdW5j dGlvbiAnY3lwcmVzc19zZXRfdGVybWlvcyc6Cj4gZHJpdmVycy91c2Ivc2VyaWFsL2N5cHJlc3Nf bTguYzo4NjY6MTg6IHdhcm5pbmc6Cj4gIHZhcmlhYmxlICdpZmxhZycgc2V0IGJ1dCBub3QgdXNl ZCBbLVd1bnVzZWQtYnV0LXNldC12YXJpYWJsZV0KPiAKPiBTaWduZWQtb2ZmLWJ5OiBZdWVIYWli aW5nIDx5dWVoYWliaW5nQGh1YXdlaS5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvdXNiL3NlcmlhbC9j eXByZXNzX204LmMgfCAxMSArKy0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRp b25zKCspLCA5IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9zZXJp YWwvY3lwcmVzc19tOC5jIGIvZHJpdmVycy91c2Ivc2VyaWFsL2N5cHJlc3NfbTguYwo+IGluZGV4 IDMxYzYwOTEuLjk4ZGZmMTIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2Ivc2VyaWFsL2N5cHJl c3NfbTguYwo+ICsrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9jeXByZXNzX204LmMKPiBAQCAtNjg2 LDcgKzY4Niw3IEBAIHN0YXRpYyBpbnQgY3lwcmVzc193cml0ZShzdHJ1Y3QgdHR5X3N0cnVjdCAq dHR5LCBzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0LAo+ICAKPiAgc3RhdGljIHZvaWQgY3lw cmVzc19zZW5kKHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQpCj4gIHsKPiAtCWludCBjb3Vu dCA9IDAsIHJlc3VsdCwgb2Zmc2V0LCBhY3R1YWxfc2l6ZTsKPiArCWludCBjb3VudCA9IDAsIHJl c3VsdCwgb2Zmc2V0Owo+ICAJc3RydWN0IGN5cHJlc3NfcHJpdmF0ZSAqcHJpdiA9IHVzYl9nZXRf c2VyaWFsX3BvcnRfZGF0YShwb3J0KTsKPiAgCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZwb3J0LT5k ZXY7Cj4gIAl1bnNpZ25lZCBsb25nIGZsYWdzOwo+IEBAIC03NTgsMTIgKzc1OCw2IEBAIHN0YXRp YyB2b2lkIGN5cHJlc3Nfc2VuZChzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQo+ICAJcHJp di0+d3JpdGVfdXJiX2luX3VzZSA9IDE7Cj4gIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZwcml2 LT5sb2NrLCBmbGFncyk7Cj4gIAo+IC0JaWYgKHByaXYtPmNtZF9jdHJsKQo+IC0JCWFjdHVhbF9z aXplID0gMTsKPiAtCWVsc2UKPiAtCQlhY3R1YWxfc2l6ZSA9IGNvdW50ICsKPiAtCQkJICAgICAg KHByaXYtPnBrdF9mbXQgPT0gcGFja2V0X2Zvcm1hdF8xID8gMiA6IDEpOwo+IC0KClRoaXMgbG9v a3MgbGlrZSB3ZSBoYXZlIGEgYnVnIGluIHRoZSBkcml2ZXIsIGFuZCBzdXJlIGVub3VnaCB3ZSBk by4KQ29tbWl0IDlhYThkYWU3YjFmYSAoImN5cHJlc3NfbTg6IHVzZSB1c2JfZmlsbF9pbnRfdXJi IHdoZXJlCmFwcHJvcHJpYXRlIikgaW5jb3JyZWN0bHkgc3RhcnRlZCBzZXR0aW5nIHRoZSB0cmFu c2ZlciBsZW5ndGggdG8gdGhlCnNpemUgb2YgdGhlIGJ1ZmZlci4KCkkndmUgcHJlcGFyZWQgYSBm aXggdG8gdGhpcy4KCj4gIAl1c2Jfc2VyaWFsX2RlYnVnX2RhdGEoZGV2LCBfX2Z1bmNfXywgcG9y dC0+aW50ZXJydXB0X291dF9zaXplLAo+ICAJCQkgICAgICBwb3J0LT5pbnRlcnJ1cHRfb3V0X3Vy Yi0+dHJhbnNmZXJfYnVmZmVyKTsKPiAgCj4gQEAgLTg2Myw3ICs4NTcsNyBAQCBzdGF0aWMgdm9p ZCBjeXByZXNzX3NldF90ZXJtaW9zKHN0cnVjdCB0dHlfc3RydWN0ICp0dHksCj4gIAlzdHJ1Y3Qg Y3lwcmVzc19wcml2YXRlICpwcml2ID0gdXNiX2dldF9zZXJpYWxfcG9ydF9kYXRhKHBvcnQpOwo+ ICAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBvcnQtPmRldjsKPiAgCWludCBkYXRhX2JpdHMsIHN0 b3BfYml0cywgcGFyaXR5X3R5cGUsIHBhcml0eV9lbmFibGU7Cj4gLQl1bnNpZ25lZCBjZmxhZywg aWZsYWc7Cj4gKwl1bnNpZ25lZCBpbnQgY2ZsYWc7Cj4gIAl1bnNpZ25lZCBsb25nIGZsYWdzOwo+ ICAJX191OCBvbGRsaW5lczsKPiAgCWludCBsaW5lY2hhbmdlID0gMDsKPiBAQCAtODk5LDcgKzg5 Myw2IEBAIHN0YXRpYyB2b2lkIGN5cHJlc3Nfc2V0X3Rlcm1pb3Moc3RydWN0IHR0eV9zdHJ1Y3Qg KnR0eSwKPiAgCXR0eS0+dGVybWlvcy5jX2NmbGFnICY9IH4oQ01TUEFSfENSVFNDVFMpOwo+ICAK PiAgCWNmbGFnID0gdHR5LT50ZXJtaW9zLmNfY2ZsYWc7Cj4gLQlpZmxhZyA9IHR0eS0+dGVybWlv cy5jX2lmbGFnOwo+ICAKPiAgCS8qIGNoZWNrIGlmIHRoZXJlIGFyZSBuZXcgc2V0dGluZ3MgKi8K PiAgCWlmIChvbGRfdGVybWlvcykgewoKV291bGQgeW91IG1pbmQgcmVzZW5kaW5nIGp1c3QgdGhp cyBjaHVuayBhcyBhIHYyPwoKVGhhbmtzLApKb2hhbgo=