aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 17:00:11 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 17:00:11 -0500
commit8111e4ecf9373f6d76504416b0e76b18372f3598 (patch)
treea936712836b3e6cfa401989cc32e86e99180100d
parentdd63b0b4d6d036e1d5f7008c97c30789415489de (diff)
USB: serial: metro-usb: remove unneeded cast and function call
We should use kzalloc() instead of kmalloc() and memset(), and remove an unneeded void * cast as well. Cc: Aleksey Babahin <tamerlan311@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/metro-usb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index e968d3396813..6b7d2779148c 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -58,7 +58,7 @@ static bool debug;
58 58
59static void metrousb_read_int_callback(struct urb *urb) 59static void metrousb_read_int_callback(struct urb *urb)
60{ 60{
61 struct usb_serial_port *port = (struct usb_serial_port *)urb->context; 61 struct usb_serial_port *port = urb->context;
62 struct metrousb_private *metro_priv = usb_get_serial_port_data(port); 62 struct metrousb_private *metro_priv = usb_get_serial_port_data(port);
63 struct tty_struct *tty; 63 struct tty_struct *tty;
64 unsigned char *data = urb->transfer_buffer; 64 unsigned char *data = urb->transfer_buffer;
@@ -253,13 +253,10 @@ static int metrousb_startup(struct usb_serial *serial)
253 port = serial->port[i]; 253 port = serial->port[i];
254 254
255 /* Declare memory. */ 255 /* Declare memory. */
256 metro_priv = kmalloc(sizeof(struct metrousb_private), GFP_KERNEL); 256 metro_priv = kzalloc(sizeof(struct metrousb_private), GFP_KERNEL);
257 if (!metro_priv) 257 if (!metro_priv)
258 return -ENOMEM; 258 return -ENOMEM;
259 259
260 /* Clear memory. */
261 memset(metro_priv, 0x00, sizeof(struct metrousb_private));
262
263 /* Initialize memory. */ 260 /* Initialize memory. */
264 spin_lock_init(&metro_priv->lock); 261 spin_lock_init(&metro_priv->lock);
265 usb_set_serial_port_data(port, metro_priv); 262 usb_set_serial_port_data(port, metro_priv);