USB: serial: drop irq-flags initialisations

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

There's no need to initialise irq-flags variables before saving the
interrupt state.

Drop the redundant initialisations from the three drivers that got this
wrong.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>

Johan Hovold 4 years ago 17cd3a10 66186716

+13 -14

3 changed files

expand all

drivers

usb

serial

digi_acceleport.c

metro-usb.c

quatech2.c

+6 -7

drivers/usb/serial/digi_acceleport.c

··· 372 372 int len; 373 373 struct usb_serial_port *oob_port = (struct usb_serial_port *)((struct digi_serial *)(usb_get_serial_data(port->serial)))->ds_oob_port; 374 374 struct digi_port *oob_priv = usb_get_serial_port_data(oob_port); 375 - unsigned long flags = 0; 375 + unsigned long flags; 376 376 377 377 dev_dbg(&port->dev, 378 378 "digi_write_oob_command: TOP: port=%d, count=%d\n", ··· 430 430 int len; 431 431 struct digi_port *priv = usb_get_serial_port_data(port); 432 432 unsigned char *data = port->write_urb->transfer_buffer; 433 - unsigned long flags = 0; 433 + unsigned long flags; 434 434 435 435 dev_dbg(&port->dev, "digi_write_inb_command: TOP: port=%d, count=%d\n", 436 436 priv->dp_port_num, count); ··· 511 511 struct usb_serial_port *oob_port = (struct usb_serial_port *) ((struct digi_serial *)(usb_get_serial_data(port->serial)))->ds_oob_port; 512 512 struct digi_port *oob_priv = usb_get_serial_port_data(oob_port); 513 513 unsigned char *data = oob_port->write_urb->transfer_buffer; 514 - unsigned long flags = 0; 515 - 514 + unsigned long flags; 516 515 517 516 dev_dbg(&port->dev, 518 517 "digi_set_modem_signals: TOP: port=%d, modem_signals=0x%x\n", ··· 576 577 int ret; 577 578 unsigned char buf[2]; 578 579 struct digi_port *priv = usb_get_serial_port_data(port); 579 - unsigned long flags = 0; 580 + unsigned long flags; 580 581 581 582 spin_lock_irqsave(&priv->dp_port_lock, flags); 582 583 priv->dp_transmit_idle = 0; ··· 886 887 int ret, data_len, new_len; 887 888 struct digi_port *priv = usb_get_serial_port_data(port); 888 889 unsigned char *data = port->write_urb->transfer_buffer; 889 - unsigned long flags = 0; 890 + unsigned long flags; 890 891 891 892 dev_dbg(&port->dev, "digi_write: TOP: port=%d, count=%d\n", 892 893 priv->dp_port_num, count); ··· 1023 1024 { 1024 1025 struct usb_serial_port *port = tty->driver_data; 1025 1026 struct digi_port *priv = usb_get_serial_port_data(port); 1027 + unsigned long flags; 1026 1028 unsigned int room; 1027 - unsigned long flags = 0; 1028 1029 1029 1030 spin_lock_irqsave(&priv->dp_port_lock, flags); 1030 1031

+6 -6

drivers/usb/serial/metro-usb.c

··· 109 109 struct usb_serial_port *port = urb->context; 110 110 struct metrousb_private *metro_priv = usb_get_serial_port_data(port); 111 111 unsigned char *data = urb->transfer_buffer; 112 + unsigned long flags; 112 113 int throttled = 0; 113 114 int result = 0; 114 - unsigned long flags = 0; 115 115 116 116 dev_dbg(&port->dev, "%s\n", __func__); 117 117 ··· 171 171 { 172 172 struct usb_serial *serial = port->serial; 173 173 struct metrousb_private *metro_priv = usb_get_serial_port_data(port); 174 - unsigned long flags = 0; 174 + unsigned long flags; 175 175 int result = 0; 176 176 177 177 /* Set the private data information for the port. */ ··· 268 268 { 269 269 struct usb_serial_port *port = tty->driver_data; 270 270 struct metrousb_private *metro_priv = usb_get_serial_port_data(port); 271 - unsigned long flags = 0; 271 + unsigned long flags; 272 272 273 273 /* Set the private information for the port to stop reading data. */ 274 274 spin_lock_irqsave(&metro_priv->lock, flags); ··· 281 281 unsigned long control_state = 0; 282 282 struct usb_serial_port *port = tty->driver_data; 283 283 struct metrousb_private *metro_priv = usb_get_serial_port_data(port); 284 - unsigned long flags = 0; 284 + unsigned long flags; 285 285 286 286 spin_lock_irqsave(&metro_priv->lock, flags); 287 287 control_state = metro_priv->control_state; ··· 296 296 struct usb_serial_port *port = tty->driver_data; 297 297 struct usb_serial *serial = port->serial; 298 298 struct metrousb_private *metro_priv = usb_get_serial_port_data(port); 299 - unsigned long flags = 0; 299 + unsigned long flags; 300 300 unsigned long control_state = 0; 301 301 302 302 dev_dbg(&port->dev, "%s - set=%d, clear=%d\n", __func__, set, clear); ··· 323 323 { 324 324 struct usb_serial_port *port = tty->driver_data; 325 325 struct metrousb_private *metro_priv = usb_get_serial_port_data(port); 326 - unsigned long flags = 0; 326 + unsigned long flags; 327 327 int result = 0; 328 328 329 329 /* Set the private information for the port to resume reading data. */

+1 -1

drivers/usb/serial/quatech2.c

··· 874 874 { 875 875 struct usb_serial_port *port = tty->driver_data; 876 876 struct qt2_port_private *port_priv; 877 - unsigned long flags = 0; 877 + unsigned long flags; 878 878 unsigned int r; 879 879 880 880 port_priv = usb_get_serial_port_data(port);