Skip to content

Commit

Permalink
USB: serial: metro-usb: remove unneeded cast and function call
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Mar 8, 2012
1 parent dd63b0b commit 8111e4e
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/usb/serial/metro-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static bool debug;

static void metrousb_read_int_callback(struct urb *urb)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
struct usb_serial_port *port = urb->context;
struct metrousb_private *metro_priv = usb_get_serial_port_data(port);
struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer;
Expand Down Expand Up @@ -253,13 +253,10 @@ static int metrousb_startup(struct usb_serial *serial)
port = serial->port[i];

/* Declare memory. */
metro_priv = kmalloc(sizeof(struct metrousb_private), GFP_KERNEL);
metro_priv = kzalloc(sizeof(struct metrousb_private), GFP_KERNEL);
if (!metro_priv)
return -ENOMEM;

/* Clear memory. */
memset(metro_priv, 0x00, sizeof(struct metrousb_private));

/* Initialize memory. */
spin_lock_init(&metro_priv->lock);
usb_set_serial_port_data(port, metro_priv);
Expand Down

0 comments on commit 8111e4e

Please sign in to comment.