summaryrefslogtreecommitdiff
path: root/drivers/net/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/aqc111.c2
-rw-r--r--drivers/net/usb/asix_devices.c2
-rw-r--r--drivers/net/usb/ax88172a.c2
-rw-r--r--drivers/net/usb/ax88179_178a.c2
-rw-r--r--drivers/net/usb/cdc_ncm.c2
-rw-r--r--drivers/net/usb/cx82310_eth.c2
-rw-r--r--drivers/net/usb/hso.c10
-rw-r--r--drivers/net/usb/lan78xx.c4
-rw-r--r--drivers/net/usb/lg-vl600.c2
-rw-r--r--drivers/net/usb/r8152.c2
-rw-r--r--drivers/net/usb/sierra_net.c2
-rw-r--r--drivers/net/usb/smsc95xx.c2
12 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c
index 5ab60f7c90dd..cbffa9ae1bb6 100644
--- a/drivers/net/usb/aqc111.c
+++ b/drivers/net/usb/aqc111.c
@@ -703,7 +703,7 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf)
return ret;
}
- aqc111_data = kzalloc_obj(*aqc111_data, GFP_KERNEL);
+ aqc111_data = kzalloc_obj(*aqc111_data);
if (!aqc111_data)
return -ENOMEM;
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index ca8a9d04a16b..df0bcfedddbc 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -1314,7 +1314,7 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
dev->rx_urb_size = 2048;
}
- dev->driver_priv = kzalloc_obj(struct asix_common_private, GFP_KERNEL);
+ dev->driver_priv = kzalloc_obj(struct asix_common_private);
if (!dev->driver_priv)
return -ENOMEM;
diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 54c0ba627b50..6b14bce2a552 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -165,7 +165,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
if (ret)
return ret;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 46e6c4dcda47..98f899ea2e94 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -1287,7 +1287,7 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
if (ret < 0)
return ret;
- ax179_data = kzalloc_obj(*ax179_data, GFP_KERNEL);
+ ax179_data = kzalloc_obj(*ax179_data);
if (!ax179_data)
return -ENOMEM;
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 39e8063b1f5b..7057c6c0cfc6 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -827,7 +827,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
u8 iface_no;
struct usb_cdc_parsed_header hdr;
- ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+ ctx = kzalloc_obj(*ctx);
if (!ctx)
return -ENOMEM;
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c
index 54199fde1c64..068acb052adb 100644
--- a/drivers/net/usb/cx82310_eth.c
+++ b/drivers/net/usb/cx82310_eth.c
@@ -173,7 +173,7 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
if (!dev->partial_data)
return -ENOMEM;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv) {
ret = -ENOMEM;
goto err_partial;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 1da216248896..e7f66e4f63b5 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2313,7 +2313,7 @@ static struct hso_device *hso_create_device(struct usb_interface *intf,
{
struct hso_device *hso_dev;
- hso_dev = kzalloc_obj(*hso_dev, GFP_KERNEL);
+ hso_dev = kzalloc_obj(*hso_dev);
if (!hso_dev)
return NULL;
@@ -2617,7 +2617,7 @@ static struct hso_device *hso_create_bulk_serial_device(
if (!hso_dev)
return NULL;
- serial = kzalloc_obj(*serial, GFP_KERNEL);
+ serial = kzalloc_obj(*serial);
if (!serial)
goto exit;
@@ -2626,7 +2626,7 @@ static struct hso_device *hso_create_bulk_serial_device(
if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) {
num_urbs = 2;
- serial->tiocmget = kzalloc_obj(struct hso_tiocmget, GFP_KERNEL);
+ serial->tiocmget = kzalloc_obj(struct hso_tiocmget);
if (!serial->tiocmget)
goto exit;
serial->tiocmget->serial_state_notification
@@ -2710,7 +2710,7 @@ struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface,
if (!hso_dev)
return NULL;
- serial = kzalloc_obj(*serial, GFP_KERNEL);
+ serial = kzalloc_obj(*serial);
if (!serial)
goto err_free_dev;
@@ -2754,7 +2754,7 @@ static void hso_free_shared_int(struct hso_shared_int *mux)
static
struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface)
{
- struct hso_shared_int *mux = kzalloc_obj(*mux, GFP_KERNEL);
+ struct hso_shared_int *mux = kzalloc_obj(*mux);
if (!mux)
return NULL;
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 92ec3e73edff..8da8e04c3109 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -682,7 +682,7 @@ static int lan78xx_read_stats(struct lan78xx_net *dev,
u32 *src;
u32 *dst;
- stats = kmalloc_obj(*stats, GFP_KERNEL);
+ stats = kmalloc_obj(*stats);
if (!stats)
return -ENOMEM;
@@ -3728,7 +3728,7 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
int ret;
int i;
- dev->data[0] = (unsigned long) kzalloc_obj(*pdata, GFP_KERNEL);
+ dev->data[0] = (unsigned long) kzalloc_obj(*pdata);
pdata = (struct lan78xx_priv *)(dev->data[0]);
if (!pdata) {
diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c
index 21f6a4795295..c4ad2d9f6f4f 100644
--- a/drivers/net/usb/lg-vl600.c
+++ b/drivers/net/usb/lg-vl600.c
@@ -56,7 +56,7 @@ struct vl600_state {
static int vl600_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret;
- struct vl600_state *s = kzalloc_obj(struct vl600_state, GFP_KERNEL);
+ struct vl600_state *s = kzalloc_obj(struct vl600_state);
if (!s)
return -ENOMEM;
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index c224d2ee107c..4af85728ac4f 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -9647,7 +9647,7 @@ static u8 __rtl_get_hw_ver(struct usb_device *udev)
int ret;
int i;
- tmp = kmalloc_obj(*tmp, GFP_KERNEL);
+ tmp = kmalloc_obj(*tmp);
if (!tmp)
return 0;
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 87a10f5ab557..4d3ed642b3e7 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -683,7 +683,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
return -ENODEV;
}
/* Initialize sierra private data */
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index df2c4c1f8c0b..42e4048b574b 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1157,7 +1157,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
return ret;
}
- pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+ pdata = kzalloc_obj(*pdata);
if (!pdata)
return -ENOMEM;