Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

This was done entirely with mindless brute force, using

    git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
        xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'

to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.

Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.

For the same reason the 'flex' versions will be done as a separate
conversion.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

40 files changed, 67 insertions, 67 deletions

diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 336d199e4994..d974da43fba3 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -126,7 +126,7 @@ static int ark3116_port_probe(struct usb_serial_port *port)
 	struct usb_serial *serial = port->serial;
 	struct ark3116_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 334f59c512d7..38ac910b1082 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -114,7 +114,7 @@ static int belkin_sa_port_probe(struct usb_serial_port *port)
 	struct usb_device *dev = port->serial->dev;
 	struct belkin_sa_private *priv;
 
-	priv = kmalloc_obj(struct belkin_sa_private, GFP_KERNEL);
+	priv = kmalloc_obj(struct belkin_sa_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index ceb2612a9228..569f4aede215 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -381,7 +381,7 @@ static int ch341_port_probe(struct usb_serial_port *port)
 	struct ch341_private *priv;
 	int r;
 
-	priv = kzalloc_obj(struct ch341_private, GFP_KERNEL);
+	priv = kzalloc_obj(struct ch341_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 4b5f56bd01e8..29f09190846e 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -133,7 +133,7 @@ static int usb_console_setup(struct console *co, char *options)
 			 * the termios structure, then later call set_termios to
 			 * configure according to command line arguments
 			 */
-			tty = kzalloc_obj(*tty, GFP_KERNEL);
+			tty = kzalloc_obj(*tty);
 			if (!tty) {
 				retval = -ENOMEM;
 				goto reset_open_count;
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 3c30dd095b32..333b8b463704 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -2006,7 +2006,7 @@ static int cp210x_port_probe(struct usb_serial_port *port)
 	struct usb_serial *serial = port->serial;
 	struct cp210x_port_private *port_priv;
 
-	port_priv = kzalloc_obj(*port_priv, GFP_KERNEL);
+	port_priv = kzalloc_obj(*port_priv);
 	if (!port_priv)
 		return -ENOMEM;
 
@@ -2163,7 +2163,7 @@ static int cp210x_attach(struct usb_serial *serial)
 	int result;
 	struct cp210x_serial_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 609d3a700b70..4e8ceb23c27d 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -101,7 +101,7 @@ static int cyberjack_port_probe(struct usb_serial_port *port)
 	struct cyberjack_private *priv;
 	int result;
 
-	priv = kmalloc_obj(struct cyberjack_private, GFP_KERNEL);
+	priv = kmalloc_obj(struct cyberjack_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 52d52a92b7ea..afff1a0f4298 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -445,7 +445,7 @@ static int cypress_generic_port_probe(struct usb_serial_port *port)
 		return -ENODEV;
 	}
 
-	priv = kzalloc_obj(struct cypress_private, GFP_KERNEL);
+	priv = kzalloc_obj(struct cypress_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 8a8d4dc899b0..d515df045c4c 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1209,7 +1209,7 @@ static int digi_port_init(struct usb_serial_port *port, unsigned port_num)
 {
 	struct digi_port *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
@@ -1231,7 +1231,7 @@ static int digi_startup(struct usb_serial *serial)
 	struct digi_serial *serial_priv;
 	int ret;
 
-	serial_priv = kzalloc_obj(*serial_priv, GFP_KERNEL);
+	serial_priv = kzalloc_obj(*serial_priv);
 	if (!serial_priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 7500e1a85c88..af14548fa03d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2188,7 +2188,7 @@ static int ftdi_port_probe(struct usb_serial_port *port)
 	struct ftdi_private *priv;
 	int result;
 
-	priv = kzalloc_obj(struct ftdi_private, GFP_KERNEL);
+	priv = kzalloc_obj(struct ftdi_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index aa7561aba927..7205483a0115 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1373,7 +1373,7 @@ static int garmin_port_probe(struct usb_serial_port *port)
 	int status;
 	struct garmin_data *garmin_data_p;
 
-	garmin_data_p = kzalloc_obj(struct garmin_data, GFP_KERNEL);
+	garmin_data_p = kzalloc_obj(struct garmin_data);
 	if (!garmin_data_p)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index b036fcde63e4..58694b8943d1 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -498,7 +498,7 @@ static int get_epic_descriptor(struct edgeport_serial *ep)
 
 	ep->is_epic = 0;
 
-	epic = kmalloc_obj(*epic, GFP_KERNEL);
+	epic = kmalloc_obj(*epic);
 	if (!epic)
 		return -ENOMEM;
 
@@ -2714,7 +2714,7 @@ static int edge_startup(struct usb_serial *serial)
 	dev = serial->dev;
 
 	/* create our private serial structure */
-	edge_serial = kzalloc_obj(struct edgeport_serial, GFP_KERNEL);
+	edge_serial = kzalloc_obj(struct edgeport_serial);
 	if (!edge_serial)
 		return -ENOMEM;
 
@@ -2956,7 +2956,7 @@ static int edge_port_probe(struct usb_serial_port *port)
 {
 	struct edgeport_port *edge_port;
 
-	edge_port = kzalloc_obj(*edge_port, GFP_KERNEL);
+	edge_port = kzalloc_obj(*edge_port);
 	if (!edge_port)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index fed02fdf3dcb..cb55370e036f 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -528,7 +528,7 @@ static int tx_active(struct edgeport_port *port)
 	u8 *lsr;
 	int bytes_left = 0;
 
-	oedb = kmalloc_obj(*oedb, GFP_KERNEL);
+	oedb = kmalloc_obj(*oedb);
 	if (!oedb)
 		return -ENOMEM;
 
@@ -680,7 +680,7 @@ static int check_i2c_image(struct edgeport_serial *serial)
 	u8 *buffer;
 	u16 ttype;
 
-	rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+	rom_desc = kmalloc_obj(*rom_desc);
 	if (!rom_desc)
 		return -ENOMEM;
 
@@ -759,7 +759,7 @@ static int get_manuf_info(struct edgeport_serial *serial, u8 *buffer)
 	struct edge_ti_manuf_descriptor *desc;
 	struct device *dev = &serial->serial->dev->dev;
 
-	rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+	rom_desc = kmalloc_obj(*rom_desc);
 	if (!rom_desc)
 		return -ENOMEM;
 
@@ -1089,7 +1089,7 @@ static int do_download_mode(struct edgeport_serial *serial,
 	 * Validate Hardware version number
 	 * Read Manufacturing Descriptor from TI Based Edgeport
 	 */
-	ti_manuf_desc = kmalloc_obj(*ti_manuf_desc, GFP_KERNEL);
+	ti_manuf_desc = kmalloc_obj(*ti_manuf_desc);
 	if (!ti_manuf_desc)
 		return -ENOMEM;
 
@@ -1107,7 +1107,7 @@ static int do_download_mode(struct edgeport_serial *serial,
 		return -EINVAL;
 	}
 
-	rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+	rom_desc = kmalloc_obj(*rom_desc);
 	if (!rom_desc) {
 		kfree(ti_manuf_desc);
 		return -ENOMEM;
@@ -1123,7 +1123,7 @@ static int do_download_mode(struct edgeport_serial *serial,
 		dev_dbg(dev, "%s - Found Type FIRMWARE (Type 2) record\n",
 				__func__);
 
-		firmware_version = kmalloc_obj(*firmware_version, GFP_KERNEL);
+		firmware_version = kmalloc_obj(*firmware_version);
 		if (!firmware_version) {
 			kfree(rom_desc);
 			kfree(ti_manuf_desc);
@@ -1418,7 +1418,7 @@ static int do_boot_mode(struct edgeport_serial *serial,
 		 * Validate Hardware version number
 		 * Read Manufacturing Descriptor from TI Based Edgeport
 		 */
-		ti_manuf_desc = kmalloc_obj(*ti_manuf_desc, GFP_KERNEL);
+		ti_manuf_desc = kmalloc_obj(*ti_manuf_desc);
 		if (!ti_manuf_desc)
 			return -ENOMEM;
 
@@ -2218,7 +2218,7 @@ static void change_port_settings(struct tty_struct *tty,
 	unsigned cflag;
 	int status;
 
-	config = kmalloc_obj(*config, GFP_KERNEL);
+	config = kmalloc_obj(*config);
 	if (!config) {
 		tty->termios = *old_termios;
 		return;
@@ -2457,7 +2457,7 @@ static void edge_heartbeat_work(struct work_struct *work)
 	serial = container_of(work, struct edgeport_serial,
 			heartbeat_work.work);
 
-	rom_desc = kmalloc_obj(*rom_desc, GFP_KERNEL);
+	rom_desc = kmalloc_obj(*rom_desc);
 
 	/* Descriptor address request is enough to reset the firmware timer */
 	if (!rom_desc || !get_descriptor_addr(serial, I2C_DESC_TYPE_ION,
@@ -2496,7 +2496,7 @@ static int edge_startup(struct usb_serial *serial)
 	u16 product_id;
 
 	/* create our private serial structure */
-	edge_serial = kzalloc_obj(struct edgeport_serial, GFP_KERNEL);
+	edge_serial = kzalloc_obj(struct edgeport_serial);
 	if (!edge_serial)
 		return -ENOMEM;
 
@@ -2550,7 +2550,7 @@ static int edge_port_probe(struct usb_serial_port *port)
 	struct edgeport_port *edge_port;
 	int ret;
 
-	edge_port = kzalloc_obj(*edge_port, GFP_KERNEL);
+	edge_port = kzalloc_obj(*edge_port);
 	if (!edge_port)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index ec2b061c0e84..83709d678b3a 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -198,7 +198,7 @@ static int ipw_attach(struct usb_serial *serial)
 {
 	struct usb_wwan_intf_private *data;
 
-	data = kzalloc_obj(struct usb_wwan_intf_private, GFP_KERNEL);
+	data = kzalloc_obj(struct usb_wwan_intf_private);
 	if (!data)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 4eeec9c06a11..12e928d25ba1 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -126,7 +126,7 @@ irda_usb_find_class_desc(struct usb_serial *serial, unsigned int ifnum)
 	struct usb_irda_cs_descriptor *desc;
 	int ret;
 
-	desc = kzalloc_obj(*desc, GFP_KERNEL);
+	desc = kzalloc_obj(*desc);
 	if (!desc)
 		return NULL;
 
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 6feb886991d6..f8d6aa30a3e1 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -67,7 +67,7 @@ static int iuu_port_probe(struct usb_serial_port *port)
 	struct iuu_private *priv;
 	int ret;
 
-	priv = kzalloc_obj(struct iuu_private, GFP_KERNEL);
+	priv = kzalloc_obj(struct iuu_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index ba3f80d21e92..46448843541a 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -2789,7 +2789,7 @@ static int keyspan_startup(struct usb_serial *serial)
 	}
 
 	/* Setup private data for serial driver */
-	s_priv = kzalloc_obj(struct keyspan_serial_private, GFP_KERNEL);
+	s_priv = kzalloc_obj(struct keyspan_serial_private);
 	if (!s_priv)
 		return -ENOMEM;
 
@@ -2886,7 +2886,7 @@ static int keyspan_port_probe(struct usb_serial_port *port)
 	s_priv = usb_get_serial_data(serial);
 	d_details = s_priv->device_details;
 
-	p_priv = kzalloc_obj(*p_priv, GFP_KERNEL);
+	p_priv = kzalloc_obj(*p_priv);
 	if (!p_priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 8a0f993ec7c6..5036600dd334 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -654,7 +654,7 @@ static int keyspan_pda_port_probe(struct usb_serial_port *port)
 
 	struct keyspan_pda_private *priv;
 
-	priv = kmalloc_obj(struct keyspan_pda_private, GFP_KERNEL);
+	priv = kmalloc_obj(struct keyspan_pda_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index d2960271a1f7..ed8531a64768 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -189,7 +189,7 @@ static int klsi_105_port_probe(struct usb_serial_port *port)
 {
 	struct klsi_105_private *priv;
 
-	priv = kmalloc_obj(*priv, GFP_KERNEL);
+	priv = kmalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
@@ -378,7 +378,7 @@ static void klsi_105_set_termios(struct tty_struct *tty,
 	unsigned long flags;
 	speed_t baud;
 
-	cfg = kmalloc_obj(*cfg, GFP_KERNEL);
+	cfg = kmalloc_obj(*cfg);
 	if (!cfg)
 		return;
 
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 3f9311b3bdf9..6126afd67a7b 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -130,7 +130,7 @@ static int kobil_port_probe(struct usb_serial_port *port)
 	struct usb_serial *serial = port->serial;
 	struct kobil_private *priv;
 
-	priv = kmalloc_obj(struct kobil_private, GFP_KERNEL);
+	priv = kmalloc_obj(struct kobil_private);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 2bf86c3cc7ff..18844b92bd08 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -385,7 +385,7 @@ static int mct_u232_port_probe(struct usb_serial_port *port)
 		return -ENODEV;
 	}
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index 7e7fb49fc3d5..bc834cc48550 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -245,7 +245,7 @@ static int metrousb_port_probe(struct usb_serial_port *port)
 {
 	struct metrousb_private *metro_priv;
 
-	metro_priv = kzalloc_obj(*metro_priv, GFP_KERNEL);
+	metro_priv = kzalloc_obj(*metro_priv);
 	if (!metro_priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 1495d82bf838..94459408e7fb 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -555,7 +555,7 @@ static int mos7715_parport_init(struct usb_serial *serial)
 	struct mos7715_parport *mos_parport;
 
 	/* allocate and initialize parallel port control struct */
-	mos_parport = kzalloc_obj(struct mos7715_parport, GFP_KERNEL);
+	mos_parport = kzalloc_obj(struct mos7715_parport);
 	if (!mos_parport)
 		return -ENOMEM;
 
@@ -1703,7 +1703,7 @@ static int mos7720_port_probe(struct usb_serial_port *port)
 {
 	struct moschip_port *mos7720_port;
 
-	mos7720_port = kzalloc_obj(*mos7720_port, GFP_KERNEL);
+	mos7720_port = kzalloc_obj(*mos7720_port);
 	if (!mos7720_port)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 065ac3777906..cc663d8191bd 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1532,7 +1532,7 @@ static int mos7840_port_probe(struct usb_serial_port *port)
 	pnum = port->port_number;
 
 	dev_dbg(&port->dev, "mos7840_startup: configuring port %d\n", pnum);
-	mos7840_port = kzalloc_obj(struct moschip_port, GFP_KERNEL);
+	mos7840_port = kzalloc_obj(struct moschip_port);
 	if (!mos7840_port)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 05f5ab767a53..aa1e9745f967 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -113,7 +113,7 @@ static int omninet_port_probe(struct usb_serial_port *port)
 {
 	struct omninet_data *od;
 
-	od = kzalloc_obj(*od, GFP_KERNEL);
+	od = kzalloc_obj(*od);
 	if (!od)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 0ced33c28545..e2bed477ad57 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -354,7 +354,7 @@ static int opticon_port_probe(struct usb_serial_port *port)
 {
 	struct opticon_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 261d852aaccf..e349ed66d2ac 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2606,7 +2606,7 @@ static int option_attach(struct usb_serial *serial)
 	struct usb_wwan_intf_private *data;
 	unsigned long device_flags;
 
-	data = kzalloc_obj(struct usb_wwan_intf_private, GFP_KERNEL);
+	data = kzalloc_obj(struct usb_wwan_intf_private);
 	if (!data)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 70ddda6a300e..3ef5b5d8ce1a 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -328,7 +328,7 @@ static int oti6858_port_probe(struct usb_serial_port *port)
 {
 	struct oti6858_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 75fd24019cba..50dc838e8115 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -503,7 +503,7 @@ static int pl2303_startup(struct usb_serial *serial)
 	type = ret;
 	dev_dbg(&serial->interface->dev, "device type: %s\n", pl2303_type_data[type].name);
 
-	spriv = kzalloc_obj(*spriv, GFP_KERNEL);
+	spriv = kzalloc_obj(*spriv);
 	if (!spriv)
 		return -ENOMEM;
 
@@ -555,7 +555,7 @@ static int pl2303_port_probe(struct usb_serial_port *port)
 {
 	struct pl2303_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index bbc3e33a2d81..1a930dc668e4 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -431,7 +431,7 @@ static int qc_attach(struct usb_serial *serial)
 	struct usb_wwan_intf_private *data;
 	bool sendsetup;
 
-	data = kzalloc_obj(*data, GFP_KERNEL);
+	data = kzalloc_obj(*data);
 	if (!data)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 606beb6e12aa..b05c655b3cc4 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -626,7 +626,7 @@ static int qt2_attach(struct usb_serial *serial)
 		return status;
 	}
 
-	serial_priv = kzalloc_obj(*serial_priv, GFP_KERNEL);
+	serial_priv = kzalloc_obj(*serial_priv);
 	if (!serial_priv)
 		return -ENOMEM;
 
@@ -657,7 +657,7 @@ static int qt2_port_probe(struct usb_serial_port *port)
 	struct qt2_port_private *port_priv;
 	u8 bEndpointAddress;
 
-	port_priv = kzalloc_obj(*port_priv, GFP_KERNEL);
+	port_priv = kzalloc_obj(*port_priv);
 	if (!port_priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 3b6a025cbeb8..6e443aacae07 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -828,7 +828,7 @@ static int sierra_startup(struct usb_serial *serial)
 {
 	struct sierra_intf_private *intfdata;
 
-	intfdata = kzalloc_obj(*intfdata, GFP_KERNEL);
+	intfdata = kzalloc_obj(*intfdata);
 	if (!intfdata)
 		return -ENOMEM;
 
@@ -861,7 +861,7 @@ static int sierra_port_probe(struct usb_serial_port *port)
 	const struct sierra_iface_list *himemory_list;
 	u8 ifnum;
 
-	portdata = kzalloc_obj(*portdata, GFP_KERNEL);
+	portdata = kzalloc_obj(*portdata);
 	if (!portdata)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index df1d1eed1236..2fbb48f19efd 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -145,7 +145,7 @@ static int spcp8x5_port_probe(struct usb_serial_port *port)
 	const struct usb_device_id *id = usb_get_serial_data(port->serial);
 	struct spcp8x5_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index f73321fd5dfd..da6316410b77 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -326,7 +326,7 @@ static int ssu100_port_probe(struct usb_serial_port *port)
 {
 	struct ssu100_port_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 46158cfc546a..7a5aa39172a8 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -149,7 +149,7 @@ static int symbol_port_probe(struct usb_serial_port *port)
 {
 	struct symbol_private *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index cb6b0c018809..658b54d8fcef 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -519,7 +519,7 @@ static int ti_startup(struct usb_serial *serial)
 		dev->descriptor.bNumConfigurations,
 		dev->actconfig->desc.bConfigurationValue);
 
-	tdev = kzalloc_obj(struct ti_device, GFP_KERNEL);
+	tdev = kzalloc_obj(struct ti_device);
 	if (!tdev)
 		return -ENOMEM;
 
@@ -598,7 +598,7 @@ static int ti_port_probe(struct usb_serial_port *port)
 {
 	struct ti_port *tport;
 
-	tport = kzalloc_obj(*tport, GFP_KERNEL);
+	tport = kzalloc_obj(*tport);
 	if (!tport)
 		return -ENOMEM;
 
@@ -897,7 +897,7 @@ static void ti_set_termios(struct tty_struct *tty,
 	u16 wbaudrate;
 	u16 wflags = 0;
 
-	config = kmalloc_obj(*config, GFP_KERNEL);
+	config = kmalloc_obj(*config);
 	if (!config)
 		return;
 
diff --git a/drivers/usb/serial/upd78f0730.c b/drivers/usb/serial/upd78f0730.c
index ecf0ecfceccb..78c4d3c19a8e 100644
--- a/drivers/usb/serial/upd78f0730.c
+++ b/drivers/usb/serial/upd78f0730.c
@@ -161,7 +161,7 @@ static int upd78f0730_port_probe(struct usb_serial_port *port)
 {
 	struct upd78f0730_port_private *private;
 
-	private = kzalloc_obj(*private, GFP_KERNEL);
+	private = kzalloc_obj(*private);
 	if (!private)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 26c40f8108e4..0e072fd87c3d 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -688,7 +688,7 @@ static struct usb_serial *create_serial(struct usb_device *dev,
 {
 	struct usb_serial *serial;
 
-	serial = kzalloc_obj(*serial, GFP_KERNEL);
+	serial = kzalloc_obj(*serial);
 	if (!serial)
 		return NULL;
 	serial->dev = usb_get_dev(dev);
@@ -1005,7 +1005,7 @@ static int usb_serial_probe(struct usb_interface *interface,
 	}
 
 	/* descriptor matches, let's find the endpoints needed */
-	epds = kzalloc_obj(*epds, GFP_KERNEL);
+	epds = kzalloc_obj(*epds);
 	if (!epds) {
 		retval = -ENOMEM;
 		goto err_release_sibling;
@@ -1059,7 +1059,7 @@ static int usb_serial_probe(struct usb_interface *interface,
 
 	dev_dbg(ddev, "setting up %d port structure(s)\n", max_endpoints);
 	for (i = 0; i < max_endpoints; ++i) {
-		port = kzalloc_obj(struct usb_serial_port, GFP_KERNEL);
+		port = kzalloc_obj(struct usb_serial_port);
 		if (!port) {
 			retval = -ENOMEM;
 			goto err_free_epds;
@@ -1482,7 +1482,7 @@ int __usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers
 	 * Suspend/resume support is implemented in the usb-serial core,
 	 * so fill in the PM-related fields in udriver.
 	 */
-	udriver = kzalloc_obj(*udriver, GFP_KERNEL);
+	udriver = kzalloc_obj(*udriver);
 	if (!udriver)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index ea529a15c1f6..e752ffa4dc62 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -449,7 +449,7 @@ int usb_wwan_port_probe(struct usb_serial_port *port)
 	if (!port->bulk_in_size || !port->bulk_out_size)
 		return -ENODEV;
 
-	portdata = kzalloc_obj(*portdata, GFP_KERNEL);
+	portdata = kzalloc_obj(*portdata);
 	if (!portdata)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index c530e7a85cb4..6e2b52b2b5f8 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -278,7 +278,7 @@ static int whiteheat_attach(struct usb_serial *serial)
 		 serial->type->description,
 		 hw_info->sw_major_rev, hw_info->sw_minor_rev);
 
-	command_info = kmalloc_obj(struct whiteheat_command_private, GFP_KERNEL);
+	command_info = kmalloc_obj(struct whiteheat_command_private);
 	if (!command_info)
 		goto no_command_private;
 
@@ -329,7 +329,7 @@ static int whiteheat_port_probe(struct usb_serial_port *port)
 {
 	struct whiteheat_private *info;
 
-	info = kzalloc_obj(*info, GFP_KERNEL);
+	info = kzalloc_obj(*info);
 	if (!info)
 		return -ENOMEM;
 
diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c
index 91c0a8d0097a..9fc4082de770 100644
--- a/drivers/usb/serial/xr_serial.c
+++ b/drivers/usb/serial/xr_serial.c
@@ -756,7 +756,7 @@ static void xr_cdc_set_line_coding(struct tty_struct *tty,
 	struct usb_cdc_line_coding *lc;
 	int ret;
 
-	lc = kzalloc_obj(*lc, GFP_KERNEL);
+	lc = kzalloc_obj(*lc);
 	if (!lc)
 		return;
 
@@ -1020,7 +1020,7 @@ static int xr_port_probe(struct usb_serial_port *port)
 	type_id = (int)(unsigned long)usb_get_serial_data(port->serial);
 	type = &xr_types[type_id];
 
-	data = kzalloc_obj(*data, GFP_KERNEL);
+	data = kzalloc_obj(*data);
 	if (!data)
 		return -ENOMEM;