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>

111 files changed, 134 insertions, 134 deletions

diff --git a/drivers/media/dvb-frontends/a8293.c b/drivers/media/dvb-frontends/a8293.c
index c1eeed1d08e6..7c0963054a8f 100644
--- a/drivers/media/dvb-frontends/a8293.c
+++ b/drivers/media/dvb-frontends/a8293.c
@@ -218,7 +218,7 @@ static int a8293_probe(struct i2c_client *client)
 	int ret;
 	u8 buf[2];
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
index d004ec9e94f0..75f3063c193e 100644
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
@@ -1447,7 +1447,7 @@ static int af9013_probe(struct i2c_client *client)
 		.val_bits = 8,
 	};
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 584cc0405e4a..9a3a4d6513dd 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -1062,7 +1062,7 @@ static int af9033_probe(struct i2c_client *client)
 	};
 
 	/* Allocate memory for the internal state */
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/as102_fe.c b/drivers/media/dvb-frontends/as102_fe.c
index 5b17d0b6f3ea..fecb0735d753 100644
--- a/drivers/media/dvb-frontends/as102_fe.c
+++ b/drivers/media/dvb-frontends/as102_fe.c
@@ -447,7 +447,7 @@ struct dvb_frontend *as102_attach(const char *name,
 	struct as102_state *state;
 	struct dvb_frontend *fe;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/ascot2e.c b/drivers/media/dvb-frontends/ascot2e.c
index 0d28a3422cae..3bdb4d12f8b7 100644
--- a/drivers/media/dvb-frontends/ascot2e.c
+++ b/drivers/media/dvb-frontends/ascot2e.c
@@ -477,7 +477,7 @@ struct dvb_frontend *ascot2e_attach(struct dvb_frontend *fe,
 	u8 data[4];
 	struct ascot2e_priv *priv = NULL;
 
-	priv = kzalloc_obj(struct ascot2e_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct ascot2e_priv);
 	if (priv == NULL)
 		return NULL;
 	priv->i2c_address = (config->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/atbm8830.c b/drivers/media/dvb-frontends/atbm8830.c
index 2b9dbd748ebc..9ef8adbf9f7d 100644
--- a/drivers/media/dvb-frontends/atbm8830.c
+++ b/drivers/media/dvb-frontends/atbm8830.c
@@ -458,7 +458,7 @@ struct dvb_frontend *atbm8830_attach(const struct atbm8830_config *config,
 	if (config == NULL || i2c == NULL)
 		return NULL;
 
-	priv = kzalloc_obj(struct atbm_state, GFP_KERNEL);
+	priv = kzalloc_obj(struct atbm_state);
 	if (priv == NULL)
 		goto error_out;
 
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
index 50f43f9c7aef..7f91156d02c7 100644
--- a/drivers/media/dvb-frontends/bcm3510.c
+++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -800,7 +800,7 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,
 	bcm3510_register_value v;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct bcm3510_state, GFP_KERNEL);
+	state = kzalloc_obj(struct bcm3510_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
index 9f36c837fd66..cb1c30aee684 100644
--- a/drivers/media/dvb-frontends/cx22700.c
+++ b/drivers/media/dvb-frontends/cx22700.c
@@ -376,7 +376,7 @@ struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
 	struct cx22700_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct cx22700_state, GFP_KERNEL);
+	state = kzalloc_obj(struct cx22700_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/cx22702.c b/drivers/media/dvb-frontends/cx22702.c
index acdc8712d343..cbfe156e018a 100644
--- a/drivers/media/dvb-frontends/cx22702.c
+++ b/drivers/media/dvb-frontends/cx22702.c
@@ -582,7 +582,7 @@ struct dvb_frontend *cx22702_attach(const struct cx22702_config *config,
 	struct cx22702_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct cx22702_state, GFP_KERNEL);
+	state = kzalloc_obj(struct cx22702_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
index a413dd023aa9..fb81a2f264f4 100644
--- a/drivers/media/dvb-frontends/cx24110.c
+++ b/drivers/media/dvb-frontends/cx24110.c
@@ -588,7 +588,7 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
 	int ret;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct cx24110_state, GFP_KERNEL);
+	state = kzalloc_obj(struct cx24110_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/cx24113.c b/drivers/media/dvb-frontends/cx24113.c
index 450e9d02e950..22f8544f1907 100644
--- a/drivers/media/dvb-frontends/cx24113.c
+++ b/drivers/media/dvb-frontends/cx24113.c
@@ -542,7 +542,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
 		const struct cx24113_config *config, struct i2c_adapter *i2c)
 {
 	/* allocate memory for the internal state */
-	struct cx24113_state *state = kzalloc_obj(*state, GFP_KERNEL);
+	struct cx24113_state *state = kzalloc_obj(*state);
 	int rc;
 
 	if (!state)
diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
index f7c2d7b165ce..c10053a7cb82 100644
--- a/drivers/media/dvb-frontends/cx24116.c
+++ b/drivers/media/dvb-frontends/cx24116.c
@@ -1116,7 +1116,7 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
 	dprintk("%s\n", __func__);
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (state == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
index 99555db3c537..eed03276b3b5 100644
--- a/drivers/media/dvb-frontends/cx24117.c
+++ b/drivers/media/dvb-frontends/cx24117.c
@@ -1184,7 +1184,7 @@ struct dvb_frontend *cx24117_attach(const struct cx24117_config *config,
 	}
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct cx24117_state, GFP_KERNEL);
+	state = kzalloc_obj(struct cx24117_state);
 	if (state == NULL)
 		goto error2;
 
diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c
index 2602fe350d35..438a436762a7 100644
--- a/drivers/media/dvb-frontends/cx24120.c
+++ b/drivers/media/dvb-frontends/cx24120.c
@@ -268,7 +268,7 @@ struct dvb_frontend *cx24120_attach(const struct cx24120_config *config,
 	int demod_rev;
 
 	info("Conexant cx24120/cx24118 - DVBS/S2 Satellite demod/tuner\n");
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state) {
 		err("Unable to allocate memory for cx24120_state\n");
 		goto error;
diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index ecc1a017cbe1..2706f3831c63 100644
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -1043,7 +1043,7 @@ struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
 {
 	/* allocate memory for the internal state */
 	struct cx24123_state *state =
-		kzalloc_obj(struct cx24123_state, GFP_KERNEL);
+		kzalloc_obj(struct cx24123_state);
 
 	dprintk("\n");
 	if (state == NULL) {
diff --git a/drivers/media/dvb-frontends/cxd2099.c b/drivers/media/dvb-frontends/cxd2099.c
index 80ca00f22d07..f95950a61307 100644
--- a/drivers/media/dvb-frontends/cxd2099.c
+++ b/drivers/media/dvb-frontends/cxd2099.c
@@ -609,7 +609,7 @@ static int cxd2099_probe(struct i2c_client *client)
 	unsigned int val;
 	int ret;
 
-	ci = kzalloc_obj(*ci, GFP_KERNEL);
+	ci = kzalloc_obj(*ci);
 	if (!ci) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index ed3f535db949..3deefeff4bd1 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -594,7 +594,7 @@ static int cxd2820r_probe(struct i2c_client *client)
 
 	dev_dbg(&client->dev, "\n");
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/cxd2841er.c b/drivers/media/dvb-frontends/cxd2841er.c
index db58803c85df..593107f428ce 100644
--- a/drivers/media/dvb-frontends/cxd2841er.c
+++ b/drivers/media/dvb-frontends/cxd2841er.c
@@ -3844,7 +3844,7 @@ static struct dvb_frontend *cxd2841er_attach(struct cxd2841er_config *cfg,
 	struct cxd2841er_priv *priv = NULL;
 
 	/* allocate memory for the internal state */
-	priv = kzalloc_obj(struct cxd2841er_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct cxd2841er_priv);
 	if (!priv)
 		return NULL;
 	priv->i2c = i2c;
diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
index 1a1ed41f7555..0d058b59a472 100644
--- a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
+++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
@@ -1887,7 +1887,7 @@ struct dvb_frontend *cxd2880_attach(struct dvb_frontend *fe,
 		return NULL;
 	}
 
-	priv = kzalloc_obj(struct cxd2880_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct cxd2880_priv);
 	if (!priv)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/dib0090.c b/drivers/media/dvb-frontends/dib0090.c
index f11083a955ec..f77ff444a6b0 100644
--- a/drivers/media/dvb-frontends/dib0090.c
+++ b/drivers/media/dvb-frontends/dib0090.c
@@ -2606,7 +2606,7 @@ static const struct dib0090_wbd_slope dib0090_wbd_table_default[] = {
 
 struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config)
 {
-	struct dib0090_state *st = kzalloc_obj(struct dib0090_state, GFP_KERNEL);
+	struct dib0090_state *st = kzalloc_obj(struct dib0090_state);
 	if (st == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c
index ab7046a4ff96..251410842b18 100644
--- a/drivers/media/dvb-frontends/dib3000mb.c
+++ b/drivers/media/dvb-frontends/dib3000mb.c
@@ -746,7 +746,7 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
 	struct dib3000_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct dib3000_state, GFP_KERNEL);
+	state = kzalloc_obj(struct dib3000_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/dib3000mc.c b/drivers/media/dvb-frontends/dib3000mc.c
index 12ee8a5d3b6e..544e5a0a5873 100644
--- a/drivers/media/dvb-frontends/dib3000mc.c
+++ b/drivers/media/dvb-frontends/dib3000mc.c
@@ -861,7 +861,7 @@ int dib3000mc_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defa
 
 	static const u8 DIB3000MC_I2C_ADDRESS[] = { 20, 22, 24, 26 };
 
-	dmcst = kzalloc_obj(struct dib3000mc_state, GFP_KERNEL);
+	dmcst = kzalloc_obj(struct dib3000mc_state);
 	if (dmcst == NULL)
 		return -ENOMEM;
 
@@ -910,7 +910,7 @@ struct dvb_frontend * dib3000mc_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr
 {
 	struct dvb_frontend *demod;
 	struct dib3000mc_state *st;
-	st = kzalloc_obj(struct dib3000mc_state, GFP_KERNEL);
+	st = kzalloc_obj(struct dib3000mc_state);
 	if (st == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/dib7000m.c b/drivers/media/dvb-frontends/dib7000m.c
index ffbc313915ed..44a78c7539a6 100644
--- a/drivers/media/dvb-frontends/dib7000m.c
+++ b/drivers/media/dvb-frontends/dib7000m.c
@@ -1403,7 +1403,7 @@ struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
 {
 	struct dvb_frontend *demod;
 	struct dib7000m_state *st;
-	st = kzalloc_obj(struct dib7000m_state, GFP_KERNEL);
+	st = kzalloc_obj(struct dib7000m_state);
 	if (st == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c
index 2d0c85fb11a0..48d84a05ddfa 100644
--- a/drivers/media/dvb-frontends/dib7000p.c
+++ b/drivers/media/dvb-frontends/dib7000p.c
@@ -2081,7 +2081,7 @@ static int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u
 	int k = 0;
 	u8 new_addr = 0;
 
-	dpst = kzalloc_obj(struct dib7000p_state, GFP_KERNEL);
+	dpst = kzalloc_obj(struct dib7000p_state);
 	if (!dpst)
 		return -ENOMEM;
 
@@ -2741,7 +2741,7 @@ static struct dvb_frontend *dib7000p_init(struct i2c_adapter *i2c_adap, u8 i2c_a
 {
 	struct dvb_frontend *demod;
 	struct dib7000p_state *st;
-	st = kzalloc_obj(struct dib7000p_state, GFP_KERNEL);
+	st = kzalloc_obj(struct dib7000p_state);
 	if (st == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c
index 2266178f0a22..ebef27bcc989 100644
--- a/drivers/media/dvb-frontends/dib8000.c
+++ b/drivers/media/dvb-frontends/dib8000.c
@@ -4307,7 +4307,7 @@ static int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods,
 		ret = -ENOMEM;
 		goto error_memory_read;
 	}
-	client.i2c_buffer_lock = kzalloc_obj(struct mutex, GFP_KERNEL);
+	client.i2c_buffer_lock = kzalloc_obj(struct mutex);
 	if (!client.i2c_buffer_lock) {
 		dprintk("%s: not enough memory\n", __func__);
 		ret = -ENOMEM;
@@ -4448,10 +4448,10 @@ static struct dvb_frontend *dib8000_init(struct i2c_adapter *i2c_adap, u8 i2c_ad
 
 	dprintk("dib8000_init\n");
 
-	state = kzalloc_obj(struct dib8000_state, GFP_KERNEL);
+	state = kzalloc_obj(struct dib8000_state);
 	if (state == NULL)
 		return NULL;
-	fe = kzalloc_obj(struct dvb_frontend, GFP_KERNEL);
+	fe = kzalloc_obj(struct dvb_frontend);
 	if (fe == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/dib9000.c b/drivers/media/dvb-frontends/dib9000.c
index b2e5fe1af78a..cb7c943225bd 100644
--- a/drivers/media/dvb-frontends/dib9000.c
+++ b/drivers/media/dvb-frontends/dib9000.c
@@ -2474,10 +2474,10 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c
 {
 	struct dvb_frontend *fe;
 	struct dib9000_state *st;
-	st = kzalloc_obj(struct dib9000_state, GFP_KERNEL);
+	st = kzalloc_obj(struct dib9000_state);
 	if (st == NULL)
 		return NULL;
-	fe = kzalloc_obj(struct dvb_frontend, GFP_KERNEL);
+	fe = kzalloc_obj(struct dvb_frontend);
 	if (fe == NULL) {
 		kfree(st);
 		return NULL;
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index c7a91f90ed10..367acb59b4a3 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -12276,7 +12276,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
 	int result;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct drx39xxj_state, GFP_KERNEL);
+	state = kzalloc_obj(struct drx39xxj_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
index aefdd620ce2c..4d673a108f61 100644
--- a/drivers/media/dvb-frontends/drxd_hard.c
+++ b/drivers/media/dvb-frontends/drxd_hard.c
@@ -2910,7 +2910,7 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config,
 {
 	struct drxd_state *state = NULL;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index 7fb5f46aa1d4..47786d0610f0 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -6722,7 +6722,7 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
 	int status;
 
 	dprintk(1, "\n");
-	state = kzalloc_obj(struct drxk_state, GFP_KERNEL);
+	state = kzalloc_obj(struct drxk_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
index d300c357f177..ce7ae424b27c 100644
--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
@@ -827,7 +827,7 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
 	dprintk("%s\n", __func__);
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/dvb-pll.c b/drivers/media/dvb-frontends/dvb-pll.c
index 078596bd0361..f8fd23f60e3f 100644
--- a/drivers/media/dvb-frontends/dvb-pll.c
+++ b/drivers/media/dvb-frontends/dvb-pll.c
@@ -820,7 +820,7 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,
 			     fe->ops.i2c_gate_ctrl(fe, 0);
 	}
 
-	priv = kzalloc_obj(struct dvb_pll_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct dvb_pll_priv);
 	if (!priv)
 		goto out;
 
diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
index 9ed03df364d6..6a34cdc28727 100644
--- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb-frontends/dvb_dummy_fe.c
@@ -114,7 +114,7 @@ struct dvb_frontend *dvb_dummy_fe_ofdm_attach(void)
 	struct dvb_dummy_fe_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct dvb_dummy_fe_state, GFP_KERNEL);
+	state = kzalloc_obj(struct dvb_dummy_fe_state);
 	if (!state)
 		return NULL;
 
@@ -135,7 +135,7 @@ struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void)
 	struct dvb_dummy_fe_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct dvb_dummy_fe_state, GFP_KERNEL);
+	state = kzalloc_obj(struct dvb_dummy_fe_state);
 	if (!state)
 		return NULL;
 
@@ -156,7 +156,7 @@ struct dvb_frontend *dvb_dummy_fe_qam_attach(void)
 	struct dvb_dummy_fe_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct dvb_dummy_fe_state, GFP_KERNEL);
+	state = kzalloc_obj(struct dvb_dummy_fe_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/ec100.c b/drivers/media/dvb-frontends/ec100.c
index be9ee1c90434..b7a3572f8a58 100644
--- a/drivers/media/dvb-frontends/ec100.c
+++ b/drivers/media/dvb-frontends/ec100.c
@@ -276,7 +276,7 @@ struct dvb_frontend *ec100_attach(const struct ec100_config *config,
 	u8 tmp;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct ec100_state, GFP_KERNEL);
+	state = kzalloc_obj(struct ec100_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/gp8psk-fe.c b/drivers/media/dvb-frontends/gp8psk-fe.c
index 8893de2758f6..aad311ffd2b5 100644
--- a/drivers/media/dvb-frontends/gp8psk-fe.c
+++ b/drivers/media/dvb-frontends/gp8psk-fe.c
@@ -332,7 +332,7 @@ struct dvb_frontend *gp8psk_fe_attach(const struct gp8psk_fe_ops *ops,
 		return NULL;
 	}
 
-	st = kzalloc_obj(struct gp8psk_fe_state, GFP_KERNEL);
+	st = kzalloc_obj(struct gp8psk_fe_state);
 	if (!st)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/helene.c b/drivers/media/dvb-frontends/helene.c
index 0b68fa8b2664..1402d124544e 100644
--- a/drivers/media/dvb-frontends/helene.c
+++ b/drivers/media/dvb-frontends/helene.c
@@ -997,7 +997,7 @@ struct dvb_frontend *helene_attach_s(struct dvb_frontend *fe,
 {
 	struct helene_priv *priv = NULL;
 
-	priv = kzalloc_obj(struct helene_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct helene_priv);
 	if (priv == NULL)
 		return NULL;
 	priv->i2c_address = (config->i2c_address >> 1);
@@ -1033,7 +1033,7 @@ struct dvb_frontend *helene_attach(struct dvb_frontend *fe,
 {
 	struct helene_priv *priv = NULL;
 
-	priv = kzalloc_obj(struct helene_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct helene_priv);
 	if (priv == NULL)
 		return NULL;
 	priv->i2c_address = (config->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/horus3a.c b/drivers/media/dvb-frontends/horus3a.c
index 618301eb26aa..63579d6e24e5 100644
--- a/drivers/media/dvb-frontends/horus3a.c
+++ b/drivers/media/dvb-frontends/horus3a.c
@@ -339,7 +339,7 @@ struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe,
 	u8 buf[3], val;
 	struct horus3a_priv *priv = NULL;
 
-	priv = kzalloc_obj(struct horus3a_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct horus3a_priv);
 	if (priv == NULL)
 		return NULL;
 	priv->i2c_address = (config->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/isl6405.c b/drivers/media/dvb-frontends/isl6405.c
index 96635db2eabc..2e681e2ba0c3 100644
--- a/drivers/media/dvb-frontends/isl6405.c
+++ b/drivers/media/dvb-frontends/isl6405.c
@@ -106,7 +106,7 @@ static void isl6405_release(struct dvb_frontend *fe)
 struct dvb_frontend *isl6405_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c,
 				    u8 i2c_addr, u8 override_set, u8 override_clear)
 {
-	struct isl6405 *isl6405 = kmalloc_obj(struct isl6405, GFP_KERNEL);
+	struct isl6405 *isl6405 = kmalloc_obj(struct isl6405);
 	if (!isl6405)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c
index 02d9e3b4e91d..b3c130e7dbe5 100644
--- a/drivers/media/dvb-frontends/isl6421.c
+++ b/drivers/media/dvb-frontends/isl6421.c
@@ -177,7 +177,7 @@ static void isl6421_release(struct dvb_frontend *fe)
 struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,
 		   u8 override_set, u8 override_clear, bool override_tone)
 {
-	struct isl6421 *isl6421 = kmalloc_obj(struct isl6421, GFP_KERNEL);
+	struct isl6421 *isl6421 = kmalloc_obj(struct isl6421);
 	if (!isl6421)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/isl6423.c b/drivers/media/dvb-frontends/isl6423.c
index 6bffcc381fed..48f15cca07d3 100644
--- a/drivers/media/dvb-frontends/isl6423.c
+++ b/drivers/media/dvb-frontends/isl6423.c
@@ -258,7 +258,7 @@ struct dvb_frontend *isl6423_attach(struct dvb_frontend *fe,
 {
 	struct isl6423_dev *isl6423;
 
-	isl6423 = kzalloc_obj(struct isl6423_dev, GFP_KERNEL);
+	isl6423 = kzalloc_obj(struct isl6423_dev);
 	if (!isl6423)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/itd1000.c b/drivers/media/dvb-frontends/itd1000.c
index 6c1863efe227..f5f02363917e 100644
--- a/drivers/media/dvb-frontends/itd1000.c
+++ b/drivers/media/dvb-frontends/itd1000.c
@@ -365,7 +365,7 @@ struct dvb_frontend *itd1000_attach(struct dvb_frontend *fe, struct i2c_adapter
 	struct itd1000_state *state = NULL;
 	u8 i = 0;
 
-	state = kzalloc_obj(struct itd1000_state, GFP_KERNEL);
+	state = kzalloc_obj(struct itd1000_state);
 	if (state == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/ix2505v.c b/drivers/media/dvb-frontends/ix2505v.c
index db0875f65de8..832c998a3d99 100644
--- a/drivers/media/dvb-frontends/ix2505v.c
+++ b/drivers/media/dvb-frontends/ix2505v.c
@@ -267,7 +267,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe,
 		goto error;
 	}
 
-	state = kzalloc_obj(struct ix2505v_state, GFP_KERNEL);
+	state = kzalloc_obj(struct ix2505v_state);
 	if (NULL == state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/l64781.c b/drivers/media/dvb-frontends/l64781.c
index cfec598001db..ff686c132eaf 100644
--- a/drivers/media/dvb-frontends/l64781.c
+++ b/drivers/media/dvb-frontends/l64781.c
@@ -497,7 +497,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
 			   { .addr = config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct l64781_state, GFP_KERNEL);
+	state = kzalloc_obj(struct l64781_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/lg2160.c b/drivers/media/dvb-frontends/lg2160.c
index 5c9ebfec4524..41c4aae0cb49 100644
--- a/drivers/media/dvb-frontends/lg2160.c
+++ b/drivers/media/dvb-frontends/lg2160.c
@@ -1396,7 +1396,7 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config,
 	       i2c_adap ? i2c_adapter_id(i2c_adap) : 0,
 	       config ? config->i2c_addr : 0);
 
-	state = kzalloc_obj(struct lg216x_state, GFP_KERNEL);
+	state = kzalloc_obj(struct lg216x_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/lgdt3305.c b/drivers/media/dvb-frontends/lgdt3305.c
index 9fcac3361618..e08ee89c4c26 100644
--- a/drivers/media/dvb-frontends/lgdt3305.c
+++ b/drivers/media/dvb-frontends/lgdt3305.c
@@ -1103,7 +1103,7 @@ struct dvb_frontend *lgdt3305_attach(const struct lgdt3305_config *config,
 	       i2c_adap ? i2c_adapter_id(i2c_adap) : 0,
 	       config ? config->i2c_addr : 0);
 
-	state = kzalloc_obj(struct lgdt3305_state, GFP_KERNEL);
+	state = kzalloc_obj(struct lgdt3305_state);
 	if (state == NULL)
 		goto fail;
 
diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c
index a6d885d951a5..b6a66e122ed5 100644
--- a/drivers/media/dvb-frontends/lgdt3306a.c
+++ b/drivers/media/dvb-frontends/lgdt3306a.c
@@ -1802,7 +1802,7 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,
 	       i2c_adap ? i2c_adapter_id(i2c_adap) : 0,
 	       config ? config->i2c_addr : 0);
 
-	state = kzalloc_obj(struct lgdt3306a_state, GFP_KERNEL);
+	state = kzalloc_obj(struct lgdt3306a_state);
 	if (state == NULL)
 		goto fail;
 
diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
index 43e45c2317e0..19a4a05b3499 100644
--- a/drivers/media/dvb-frontends/lgdt330x.c
+++ b/drivers/media/dvb-frontends/lgdt330x.c
@@ -863,7 +863,7 @@ static int lgdt330x_probe(struct i2c_client *client)
 	u8 buf[1];
 
 	/* Allocate memory for the internal state */
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/lgs8gl5.c b/drivers/media/dvb-frontends/lgs8gl5.c
index 07e422cb53da..3ee12a9e4526 100644
--- a/drivers/media/dvb-frontends/lgs8gl5.c
+++ b/drivers/media/dvb-frontends/lgs8gl5.c
@@ -375,7 +375,7 @@ lgs8gl5_attach(const struct lgs8gl5_config *config, struct i2c_adapter *i2c)
 	dprintk("%s\n", __func__);
 
 	/* Allocate memory for the internal state */
-	state = kzalloc_obj(struct lgs8gl5_state, GFP_KERNEL);
+	state = kzalloc_obj(struct lgs8gl5_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/lgs8gxx.c b/drivers/media/dvb-frontends/lgs8gxx.c
index 8904f767e4ad..285ac9ddd419 100644
--- a/drivers/media/dvb-frontends/lgs8gxx.c
+++ b/drivers/media/dvb-frontends/lgs8gxx.c
@@ -1012,7 +1012,7 @@ struct dvb_frontend *lgs8gxx_attach(const struct lgs8gxx_config *config,
 	if (config == NULL || i2c == NULL)
 		return NULL;
 
-	priv = kzalloc_obj(struct lgs8gxx_state, GFP_KERNEL);
+	priv = kzalloc_obj(struct lgs8gxx_state);
 	if (priv == NULL)
 		goto error_out;
 
diff --git a/drivers/media/dvb-frontends/lnbh25.c b/drivers/media/dvb-frontends/lnbh25.c
index e4e4c43465cf..8a0b9efd17db 100644
--- a/drivers/media/dvb-frontends/lnbh25.c
+++ b/drivers/media/dvb-frontends/lnbh25.c
@@ -148,7 +148,7 @@ struct dvb_frontend *lnbh25_attach(struct dvb_frontend *fe,
 	struct lnbh25_priv *priv;
 
 	dev_dbg(&i2c->dev, "%s()\n", __func__);
-	priv = kzalloc_obj(struct lnbh25_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct lnbh25_priv);
 	if (!priv)
 		return NULL;
 	priv->i2c_address = (cfg->i2c_address >> 1);
diff --git a/drivers/media/dvb-frontends/lnbh29.c b/drivers/media/dvb-frontends/lnbh29.c
index 2bb9f8b9d325..1fcb7ad16508 100644
--- a/drivers/media/dvb-frontends/lnbh29.c
+++ b/drivers/media/dvb-frontends/lnbh29.c
@@ -135,7 +135,7 @@ struct dvb_frontend *lnbh29_attach(struct dvb_frontend *fe,
 {
 	struct lnbh29_priv *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/lnbp21.c b/drivers/media/dvb-frontends/lnbp21.c
index b68fa4424acd..2007c2713cfb 100644
--- a/drivers/media/dvb-frontends/lnbp21.c
+++ b/drivers/media/dvb-frontends/lnbp21.c
@@ -113,7 +113,7 @@ static struct dvb_frontend *lnbx2x_attach(struct dvb_frontend *fe,
 				struct i2c_adapter *i2c, u8 override_set,
 				u8 override_clear, u8 i2c_addr, u8 config)
 {
-	struct lnbp21 *lnbp21 = kmalloc_obj(struct lnbp21, GFP_KERNEL);
+	struct lnbp21 *lnbp21 = kmalloc_obj(struct lnbp21);
 	if (!lnbp21)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/lnbp22.c b/drivers/media/dvb-frontends/lnbp22.c
index 98e54f74f306..9daef48d1569 100644
--- a/drivers/media/dvb-frontends/lnbp22.c
+++ b/drivers/media/dvb-frontends/lnbp22.c
@@ -96,7 +96,7 @@ static void lnbp22_release(struct dvb_frontend *fe)
 struct dvb_frontend *lnbp22_attach(struct dvb_frontend *fe,
 					struct i2c_adapter *i2c)
 {
-	struct lnbp22 *lnbp22 = kmalloc_obj(struct lnbp22, GFP_KERNEL);
+	struct lnbp22 *lnbp22 = kmalloc_obj(struct lnbp22);
 	if (!lnbp22)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index e419551ca46e..be156180e5ef 100644
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -1775,7 +1775,7 @@ static int m88ds3103_probe(struct i2c_client *client)
 	int ret;
 	unsigned int utmp;
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
index 1804c31ebe0f..9c9f34c6d3a2 100644
--- a/drivers/media/dvb-frontends/m88rs2000.c
+++ b/drivers/media/dvb-frontends/m88rs2000.c
@@ -786,7 +786,7 @@ struct dvb_frontend *m88rs2000_attach(const struct m88rs2000_config *config,
 	struct m88rs2000_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct m88rs2000_state, GFP_KERNEL);
+	state = kzalloc_obj(struct m88rs2000_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/mb86a16.c b/drivers/media/dvb-frontends/mb86a16.c
index 0c9bd4a47be4..50737e6f81dc 100644
--- a/drivers/media/dvb-frontends/mb86a16.c
+++ b/drivers/media/dvb-frontends/mb86a16.c
@@ -1833,7 +1833,7 @@ struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config,
 	u8 dev_id = 0;
 	struct mb86a16_state *state = NULL;
 
-	state = kmalloc_obj(struct mb86a16_state, GFP_KERNEL);
+	state = kmalloc_obj(struct mb86a16_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
index eb596d3b9da5..0d9bfc5b3761 100644
--- a/drivers/media/dvb-frontends/mb86a20s.c
+++ b/drivers/media/dvb-frontends/mb86a20s.c
@@ -2052,7 +2052,7 @@ struct dvb_frontend *mb86a20s_attach(const struct mb86a20s_config *config,
 	dev_dbg(&i2c->dev, "%s called.\n", __func__);
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c
index ce3ae7d8d13f..275c404ce286 100644
--- a/drivers/media/dvb-frontends/mn88472.c
+++ b/drivers/media/dvb-frontends/mn88472.c
@@ -586,7 +586,7 @@ static int mn88472_probe(struct i2c_client *client)
 
 	dev_dbg(&client->dev, "\n");
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/mn88473.c b/drivers/media/dvb-frontends/mn88473.c
index 371f9faa3038..40a0cb1d9c67 100644
--- a/drivers/media/dvb-frontends/mn88473.c
+++ b/drivers/media/dvb-frontends/mn88473.c
@@ -626,7 +626,7 @@ static int mn88473_probe(struct i2c_client *client)
 		goto err;
 	}
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (dev == NULL) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
index 06d7153f57d8..8fe850a8d914 100644
--- a/drivers/media/dvb-frontends/mt312.c
+++ b/drivers/media/dvb-frontends/mt312.c
@@ -780,7 +780,7 @@ struct dvb_frontend *mt312_attach(const struct mt312_config *config,
 	struct mt312_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct mt312_state, GFP_KERNEL);
+	state = kzalloc_obj(struct mt312_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/mt352.c b/drivers/media/dvb-frontends/mt352.c
index 3f57ac209654..7ae4d93f1f19 100644
--- a/drivers/media/dvb-frontends/mt352.c
+++ b/drivers/media/dvb-frontends/mt352.c
@@ -533,7 +533,7 @@ struct dvb_frontend* mt352_attach(const struct mt352_config* config,
 	struct mt352_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct mt352_state, GFP_KERNEL);
+	state = kzalloc_obj(struct mt352_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/mxl5xx.c b/drivers/media/dvb-frontends/mxl5xx.c
index 43d953c898fd..64d83589dfc4 100644
--- a/drivers/media/dvb-frontends/mxl5xx.c
+++ b/drivers/media/dvb-frontends/mxl5xx.c
@@ -1829,7 +1829,7 @@ struct dvb_frontend *mxl5xx_attach(struct i2c_adapter *i2c,
 	struct mxl *state;
 	struct mxl_base *base;
 
-	state = kzalloc_obj(struct mxl, GFP_KERNEL);
+	state = kzalloc_obj(struct mxl);
 	if (!state)
 		return NULL;
 
@@ -1845,7 +1845,7 @@ struct dvb_frontend *mxl5xx_attach(struct i2c_adapter *i2c,
 			goto fail;
 		state->base = base;
 	} else {
-		base = kzalloc_obj(struct mxl_base, GFP_KERNEL);
+		base = kzalloc_obj(struct mxl_base);
 		if (!base)
 			goto fail;
 		base->i2c = i2c;
diff --git a/drivers/media/dvb-frontends/mxl692.c b/drivers/media/dvb-frontends/mxl692.c
index 68455628b03d..2d8eaa20723f 100644
--- a/drivers/media/dvb-frontends/mxl692.c
+++ b/drivers/media/dvb-frontends/mxl692.c
@@ -1314,7 +1314,7 @@ static int mxl692_probe(struct i2c_client *client)
 	struct mxl692_dev *dev;
 	int ret = 0;
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		dev_dbg(&client->dev, "kzalloc() failed\n");
diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
index 5b0762938c86..d1f93ac18888 100644
--- a/drivers/media/dvb-frontends/nxt200x.c
+++ b/drivers/media/dvb-frontends/nxt200x.c
@@ -1128,7 +1128,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
 	u8 buf [] = {0,0,0,0,0};
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct nxt200x_state, GFP_KERNEL);
+	state = kzalloc_obj(struct nxt200x_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/nxt6000.c b/drivers/media/dvb-frontends/nxt6000.c
index ed12ef9cd9df..99cfa610e263 100644
--- a/drivers/media/dvb-frontends/nxt6000.c
+++ b/drivers/media/dvb-frontends/nxt6000.c
@@ -560,7 +560,7 @@ struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
 	struct nxt6000_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct nxt6000_state, GFP_KERNEL);
+	state = kzalloc_obj(struct nxt6000_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
index 4b0063823736..e908d33d7e72 100644
--- a/drivers/media/dvb-frontends/or51132.c
+++ b/drivers/media/dvb-frontends/or51132.c
@@ -552,7 +552,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
 	struct or51132_state* state = NULL;
 
 	/* Allocate memory for the internal state */
-	state = kzalloc_obj(struct or51132_state, GFP_KERNEL);
+	state = kzalloc_obj(struct or51132_state);
 	if (state == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/or51211.c b/drivers/media/dvb-frontends/or51211.c
index 2a52b1dc9d0a..8c4aabef2d99 100644
--- a/drivers/media/dvb-frontends/or51211.c
+++ b/drivers/media/dvb-frontends/or51211.c
@@ -501,7 +501,7 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,
 	struct or51211_state* state = NULL;
 
 	/* Allocate memory for the internal state */
-	state = kzalloc_obj(struct or51211_state, GFP_KERNEL);
+	state = kzalloc_obj(struct or51211_state);
 	if (state == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index ee6ba9b7c016..f0ee7c38ee79 100644
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -807,7 +807,7 @@ static int rtl2830_probe(struct i2c_client *client)
 	}
 
 	/* allocate memory for the internal state */
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (dev == NULL) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index 19ec892debb7..d8e1546aea5e 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -1043,7 +1043,7 @@ static int rtl2832_probe(struct i2c_client *client)
 	dev_dbg(&client->dev, "\n");
 
 	/* allocate memory for the internal state */
-	dev = kzalloc_obj(struct rtl2832_dev, GFP_KERNEL);
+	dev = kzalloc_obj(struct rtl2832_dev);
 	if (dev == NULL) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
index 5a59bdde8f7b..422d1a7b5456 100644
--- a/drivers/media/dvb-frontends/rtl2832_sdr.c
+++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
@@ -1330,7 +1330,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
 		ret = -EINVAL;
 		goto err;
 	}
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (dev == NULL) {
 		ret = -ENOMEM;
 		goto err_module_put;
diff --git a/drivers/media/dvb-frontends/s5h1409.c b/drivers/media/dvb-frontends/s5h1409.c
index 33f820e2d6d3..370824589ab5 100644
--- a/drivers/media/dvb-frontends/s5h1409.c
+++ b/drivers/media/dvb-frontends/s5h1409.c
@@ -946,7 +946,7 @@ struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config,
 	u16 reg;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct s5h1409_state, GFP_KERNEL);
+	state = kzalloc_obj(struct s5h1409_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/s5h1411.c b/drivers/media/dvb-frontends/s5h1411.c
index c6379da7361e..bffd3a492c65 100644
--- a/drivers/media/dvb-frontends/s5h1411.c
+++ b/drivers/media/dvb-frontends/s5h1411.c
@@ -861,7 +861,7 @@ struct dvb_frontend *s5h1411_attach(const struct s5h1411_config *config,
 	u16 reg;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct s5h1411_state, GFP_KERNEL);
+	state = kzalloc_obj(struct s5h1411_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
index 6261df9f383c..3046ee8cc0bc 100644
--- a/drivers/media/dvb-frontends/s5h1432.c
+++ b/drivers/media/dvb-frontends/s5h1432.c
@@ -337,7 +337,7 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
 
 	printk(KERN_INFO " Enter s5h1432_attach(). attach success!\n");
 	/* allocate memory for the internal state */
-	state = kmalloc_obj(struct s5h1432_state, GFP_KERNEL);
+	state = kmalloc_obj(struct s5h1432_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/s921.c b/drivers/media/dvb-frontends/s921.c
index 6d38c9742f1d..41ac1d3a64dc 100644
--- a/drivers/media/dvb-frontends/s921.c
+++ b/drivers/media/dvb-frontends/s921.c
@@ -476,7 +476,7 @@ struct dvb_frontend *s921_attach(const struct s921_config *config,
 {
 	/* allocate memory for the internal state */
 	struct s921_state *state =
-		kzalloc_obj(struct s921_state, GFP_KERNEL);
+		kzalloc_obj(struct s921_state);
 
 	dprintk("\n");
 	if (!state) {
diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index cb6802b81e41..4170696af9f0 100644
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -1158,7 +1158,7 @@ static int si2165_probe(struct i2c_client *client)
 	};
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state) {
 		ret = -ENOMEM;
 		goto error;
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index f7a1d2fc3cfb..c4bbcd127cac 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -681,7 +681,7 @@ static int si2168_probe(struct i2c_client *client)
 
 	dev_dbg(&client->dev, "\n");
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/si21xx.c b/drivers/media/dvb-frontends/si21xx.c
index ac50df3c40fb..e64ced2d6c21 100644
--- a/drivers/media/dvb-frontends/si21xx.c
+++ b/drivers/media/dvb-frontends/si21xx.c
@@ -902,7 +902,7 @@ struct dvb_frontend *si21xx_attach(const struct si21xx_config *config,
 	dprintk("%s\n", __func__);
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct si21xx_state, GFP_KERNEL);
+	state = kzalloc_obj(struct si21xx_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
index 50103c4a36f9..071c7371c699 100644
--- a/drivers/media/dvb-frontends/sp2.c
+++ b/drivers/media/dvb-frontends/sp2.c
@@ -371,7 +371,7 @@ static int sp2_probe(struct i2c_client *client)
 
 	dev_dbg(&client->dev, "\n");
 
-	s = kzalloc_obj(*s, GFP_KERNEL);
+	s = kzalloc_obj(*s);
 	if (!s) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
index 235ecfd45376..13cb736760d3 100644
--- a/drivers/media/dvb-frontends/sp887x.c
+++ b/drivers/media/dvb-frontends/sp887x.c
@@ -568,7 +568,7 @@ struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
 	struct sp887x_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct sp887x_state, GFP_KERNEL);
+	state = kzalloc_obj(struct sp887x_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
index 19a31a296e0f..4f0f31d248d6 100644
--- a/drivers/media/dvb-frontends/stb0899_drv.c
+++ b/drivers/media/dvb-frontends/stb0899_drv.c
@@ -1613,7 +1613,7 @@ struct dvb_frontend *stb0899_attach(struct stb0899_config *config, struct i2c_ad
 {
 	struct stb0899_state *state = NULL;
 
-	state = kzalloc_obj(struct stb0899_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stb0899_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/stb6000.c b/drivers/media/dvb-frontends/stb6000.c
index 85900e616490..c66d4ac17f85 100644
--- a/drivers/media/dvb-frontends/stb6000.c
+++ b/drivers/media/dvb-frontends/stb6000.c
@@ -218,7 +218,7 @@ struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe, int addr,
 	if (ret != 2)
 		return NULL;
 
-	priv = kzalloc_obj(struct stb6000_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct stb6000_priv);
 	if (priv == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
index 97238cf98067..ff7b0c780256 100644
--- a/drivers/media/dvb-frontends/stb6100.c
+++ b/drivers/media/dvb-frontends/stb6100.c
@@ -534,7 +534,7 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
 {
 	struct stb6100_state *state = NULL;
 
-	state = kzalloc_obj(struct stb6100_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stb6100_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/stv0288.c b/drivers/media/dvb-frontends/stv0288.c
index 40648b74edd4..09992f6f09cc 100644
--- a/drivers/media/dvb-frontends/stv0288.c
+++ b/drivers/media/dvb-frontends/stv0288.c
@@ -557,7 +557,7 @@ struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,
 	int id;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct stv0288_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stv0288_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/stv0297.c b/drivers/media/dvb-frontends/stv0297.c
index c0634e2436b3..dd0ecc050ad5 100644
--- a/drivers/media/dvb-frontends/stv0297.c
+++ b/drivers/media/dvb-frontends/stv0297.c
@@ -654,7 +654,7 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
 	struct stv0297_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct stv0297_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stv0297_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
index cc15bb93b7dc..0d0bd076dd32 100644
--- a/drivers/media/dvb-frontends/stv0299.c
+++ b/drivers/media/dvb-frontends/stv0299.c
@@ -671,7 +671,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
 	int id;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct stv0299_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stv0299_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index cf6b1b646b10..592ada5c77fe 100644
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -1698,10 +1698,10 @@ struct dvb_frontend *stv0367ter_attach(const struct stv0367_config *config,
 	struct stv0367ter_state *ter_state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct stv0367_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stv0367_state);
 	if (state == NULL)
 		goto error;
-	ter_state = kzalloc_obj(struct stv0367ter_state, GFP_KERNEL);
+	ter_state = kzalloc_obj(struct stv0367ter_state);
 	if (ter_state == NULL)
 		goto error;
 
@@ -2865,10 +2865,10 @@ struct dvb_frontend *stv0367cab_attach(const struct stv0367_config *config,
 	struct stv0367cab_state *cab_state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct stv0367_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stv0367_state);
 	if (state == NULL)
 		goto error;
-	cab_state = kzalloc_obj(struct stv0367cab_state, GFP_KERNEL);
+	cab_state = kzalloc_obj(struct stv0367cab_state);
 	if (cab_state == NULL)
 		goto error;
 
@@ -3274,13 +3274,13 @@ struct dvb_frontend *stv0367ddb_attach(const struct stv0367_config *config,
 	struct stv0367cab_state *cab_state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct stv0367_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stv0367_state);
 	if (state == NULL)
 		goto error;
-	ter_state = kzalloc_obj(struct stv0367ter_state, GFP_KERNEL);
+	ter_state = kzalloc_obj(struct stv0367ter_state);
 	if (ter_state == NULL)
 		goto error;
-	cab_state = kzalloc_obj(struct stv0367cab_state, GFP_KERNEL);
+	cab_state = kzalloc_obj(struct stv0367cab_state);
 	if (cab_state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/stv0900_core.c b/drivers/media/dvb-frontends/stv0900_core.c
index 3f1edc8559c5..21899b6223b6 100644
--- a/drivers/media/dvb-frontends/stv0900_core.c
+++ b/drivers/media/dvb-frontends/stv0900_core.c
@@ -85,7 +85,7 @@ static struct stv0900_inode *append_internal(struct stv0900_internal *internal)
 	struct stv0900_inode *new_node = stv0900_first_inode;
 
 	if (new_node == NULL) {
-		new_node = kmalloc_obj(struct stv0900_inode, GFP_KERNEL);
+		new_node = kmalloc_obj(struct stv0900_inode);
 		stv0900_first_inode = new_node;
 	} else {
 		while (new_node->next_inode != NULL)
@@ -1903,7 +1903,7 @@ struct dvb_frontend *stv0900_attach(const struct stv0900_config *config,
 	struct stv0900_init_params init_params;
 	enum fe_stv0900_error err_stv0900;
 
-	state = kzalloc_obj(struct stv0900_state, GFP_KERNEL);
+	state = kzalloc_obj(struct stv0900_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
index 16ff5c8cf417..657df713865e 100644
--- a/drivers/media/dvb-frontends/stv090x.c
+++ b/drivers/media/dvb-frontends/stv090x.c
@@ -85,7 +85,7 @@ static struct stv090x_dev *append_internal(struct stv090x_internal *internal)
 	struct stv090x_dev *new_dev;
 	struct stv090x_dev *temp_dev;
 
-	new_dev = kmalloc_obj(struct stv090x_dev, GFP_KERNEL);
+	new_dev = kmalloc_obj(struct stv090x_dev);
 	if (new_dev != NULL) {
 		new_dev->internal = internal;
 		new_dev->next_dev = NULL;
@@ -4906,7 +4906,7 @@ static int stv090x_setup_compound(struct stv090x_state *state)
 		state->internal->num_used++;
 		dprintk(FE_INFO, 1, "Found Internal Structure!");
 	} else {
-		state->internal = kmalloc_obj(*state->internal, GFP_KERNEL);
+		state->internal = kmalloc_obj(*state->internal);
 		if (!state->internal)
 			goto error;
 		temp_int = append_internal(state->internal);
@@ -5002,7 +5002,7 @@ static int stv090x_probe(struct i2c_client *client)
 
 	struct stv090x_state *state = NULL;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state) {
 		ret = -ENOMEM;
 		goto error;
@@ -5050,7 +5050,7 @@ struct dvb_frontend *stv090x_attach(struct stv090x_config *config,
 	int ret = 0;
 	struct stv090x_state *state = NULL;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/stv0910.c b/drivers/media/dvb-frontends/stv0910.c
index 666562f7ca17..b841f7e9c664 100644
--- a/drivers/media/dvb-frontends/stv0910.c
+++ b/drivers/media/dvb-frontends/stv0910.c
@@ -1766,7 +1766,7 @@ struct dvb_frontend *stv0910_attach(struct i2c_adapter *i2c,
 	struct stv *state;
 	struct stv_base *base;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return NULL;
 
@@ -1788,7 +1788,7 @@ struct dvb_frontend *stv0910_attach(struct i2c_adapter *i2c,
 		base->count++;
 		state->base = base;
 	} else {
-		base = kzalloc_obj(*base, GFP_KERNEL);
+		base = kzalloc_obj(*base);
 		if (!base)
 			goto fail;
 		base->i2c = i2c;
diff --git a/drivers/media/dvb-frontends/stv6110.c b/drivers/media/dvb-frontends/stv6110.c
index beb1c832a13d..87019aa57a16 100644
--- a/drivers/media/dvb-frontends/stv6110.c
+++ b/drivers/media/dvb-frontends/stv6110.c
@@ -408,7 +408,7 @@ struct dvb_frontend *stv6110_attach(struct dvb_frontend *fe,
 	if (ret != 1)
 		return NULL;
 
-	priv = kzalloc_obj(struct stv6110_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct stv6110_priv);
 	if (priv == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
index 4122f7655b0a..7506f39ead55 100644
--- a/drivers/media/dvb-frontends/stv6110x.c
+++ b/drivers/media/dvb-frontends/stv6110x.c
@@ -412,7 +412,7 @@ static int stv6110x_probe(struct i2c_client *client)
 
 	struct stv6110x_state *stv6110x;
 
-	stv6110x = kzalloc_obj(*stv6110x, GFP_KERNEL);
+	stv6110x = kzalloc_obj(*stv6110x);
 	if (!stv6110x)
 		return -ENOMEM;
 
@@ -448,7 +448,7 @@ const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
 {
 	struct stv6110x_state *stv6110x;
 
-	stv6110x = kzalloc_obj(*stv6110x, GFP_KERNEL);
+	stv6110x = kzalloc_obj(*stv6110x);
 	if (!stv6110x)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/stv6111.c b/drivers/media/dvb-frontends/stv6111.c
index d367ee7f3cbe..876e254c6fbb 100644
--- a/drivers/media/dvb-frontends/stv6111.c
+++ b/drivers/media/dvb-frontends/stv6111.c
@@ -653,7 +653,7 @@ struct dvb_frontend *stv6111_attach(struct dvb_frontend *fe,
 	int stat = -ENODEV;
 	int gatestat = 0;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return NULL;
 	state->adr = adr;
diff --git a/drivers/media/dvb-frontends/tc90522.c b/drivers/media/dvb-frontends/tc90522.c
index 3ac0b7a0844f..f1343ba67b97 100644
--- a/drivers/media/dvb-frontends/tc90522.c
+++ b/drivers/media/dvb-frontends/tc90522.c
@@ -647,7 +647,7 @@ tc90522_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 	for (i = 0; i < num; i++)
 		if (msgs[i].flags & I2C_M_RD)
 			rd_num++;
-	new_msgs = kmalloc_objs(*new_msgs, num + rd_num, GFP_KERNEL);
+	new_msgs = kmalloc_objs(*new_msgs, num + rd_num);
 	if (!new_msgs)
 		return -ENOMEM;
 
@@ -788,7 +788,7 @@ static int tc90522_probe(struct i2c_client *client)
 	struct i2c_adapter *adap;
 	int ret;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return -ENOMEM;
 	state->i2c_client = client;
diff --git a/drivers/media/dvb-frontends/tda10021.c b/drivers/media/dvb-frontends/tda10021.c
index 9a950ee9562e..3c09b7e4a966 100644
--- a/drivers/media/dvb-frontends/tda10021.c
+++ b/drivers/media/dvb-frontends/tda10021.c
@@ -451,7 +451,7 @@ struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config,
 	u8 id;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct tda10021_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda10021_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/tda10023.c b/drivers/media/dvb-frontends/tda10023.c
index c8b1cc0f7abb..3284fc46e97f 100644
--- a/drivers/media/dvb-frontends/tda10023.c
+++ b/drivers/media/dvb-frontends/tda10023.c
@@ -511,7 +511,7 @@ struct dvb_frontend *tda10023_attach(const struct tda10023_config *config,
 	struct tda10023_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct tda10023_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda10023_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
index fe9685cbf7a5..c29eda634c85 100644
--- a/drivers/media/dvb-frontends/tda10048.c
+++ b/drivers/media/dvb-frontends/tda10048.c
@@ -1097,7 +1097,7 @@ struct dvb_frontend *tda10048_attach(const struct tda10048_config *config,
 	dprintk(1, "%s()\n", __func__);
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct tda10048_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda10048_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
index 0a1bf80211d3..7eefc8814243 100644
--- a/drivers/media/dvb-frontends/tda1004x.c
+++ b/drivers/media/dvb-frontends/tda1004x.c
@@ -1271,7 +1271,7 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
 	int id;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct tda1004x_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda1004x_state);
 	if (!state) {
 		printk(KERN_ERR "Can't allocate memory for tda10045 state\n");
 		return NULL;
@@ -1341,7 +1341,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
 	int id;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct tda1004x_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda1004x_state);
 	if (!state) {
 		printk(KERN_ERR "Can't allocate memory for tda10046 state\n");
 		return NULL;
diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index 430702da6e79..6e6c2e5c427e 100644
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -1156,7 +1156,7 @@ static int tda10071_probe(struct i2c_client *client)
 		.val_bits = 8,
 	};
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/tda10086.c b/drivers/media/dvb-frontends/tda10086.c
index 5e63ded2cfbf..d43d0eb73721 100644
--- a/drivers/media/dvb-frontends/tda10086.c
+++ b/drivers/media/dvb-frontends/tda10086.c
@@ -737,7 +737,7 @@ struct dvb_frontend* tda10086_attach(const struct tda10086_config* config,
 	dprintk ("%s\n", __func__);
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct tda10086_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda10086_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c
index f10d74ff192c..25005e4359ad 100644
--- a/drivers/media/dvb-frontends/tda18271c2dd.c
+++ b/drivers/media/dvb-frontends/tda18271c2dd.c
@@ -1215,7 +1215,7 @@ struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe,
 {
 	struct tda_state *state;
 
-	state = kzalloc_obj(struct tda_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/tda665x.c b/drivers/media/dvb-frontends/tda665x.c
index f9dcbb69e949..b2201ec14091 100644
--- a/drivers/media/dvb-frontends/tda665x.c
+++ b/drivers/media/dvb-frontends/tda665x.c
@@ -207,7 +207,7 @@ struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
 	struct tda665x_state *state = NULL;
 	struct dvb_tuner_info *info;
 
-	state = kzalloc_obj(struct tda665x_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda665x_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
index c9f280cdd7db..5a1b3599afa4 100644
--- a/drivers/media/dvb-frontends/tda8083.c
+++ b/drivers/media/dvb-frontends/tda8083.c
@@ -417,7 +417,7 @@ struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
 	struct tda8083_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct tda8083_state, GFP_KERNEL);
+	state = kzalloc_obj(struct tda8083_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
index 73c90442f403..55f898f6a6f7 100644
--- a/drivers/media/dvb-frontends/tda8261.c
+++ b/drivers/media/dvb-frontends/tda8261.c
@@ -168,7 +168,7 @@ struct dvb_frontend *tda8261_attach(struct dvb_frontend *fe,
 {
 	struct tda8261_state *state = NULL;
 
-	if ((state = kzalloc_obj(struct tda8261_state, GFP_KERNEL)) == NULL)
+	if ((state = kzalloc_obj(struct tda8261_state)) == NULL)
 		goto exit;
 
 	state->config		= config;
diff --git a/drivers/media/dvb-frontends/tda826x.c b/drivers/media/dvb-frontends/tda826x.c
index b51da4053ef5..9ee6bc4e6637 100644
--- a/drivers/media/dvb-frontends/tda826x.c
+++ b/drivers/media/dvb-frontends/tda826x.c
@@ -150,7 +150,7 @@ struct dvb_frontend *tda826x_attach(struct dvb_frontend *fe, int addr, struct i2
 	if (!(b1[1] & 0x80))
 		return NULL;
 
-	priv = kzalloc_obj(struct tda826x_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct tda826x_priv);
 	if (priv == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index 2368214781a6..8b6006635e49 100644
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -566,7 +566,7 @@ static int ts2020_probe(struct i2c_client *client)
 	}
 
 	fe = pdata->fe;
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/tua6100.c b/drivers/media/dvb-frontends/tua6100.c
index 2d052bfb8a23..d7ca25afd6a6 100644
--- a/drivers/media/dvb-frontends/tua6100.c
+++ b/drivers/media/dvb-frontends/tua6100.c
@@ -175,7 +175,7 @@ struct dvb_frontend *tua6100_attach(struct dvb_frontend *fe, int addr, struct i2
 	if (ret != 2)
 		return NULL;
 
-	priv = kzalloc_obj(struct tua6100_priv, GFP_KERNEL);
+	priv = kzalloc_obj(struct tua6100_priv);
 	if (priv == NULL)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/ves1820.c b/drivers/media/dvb-frontends/ves1820.c
index 56bbd52d1783..c9461c8c55c7 100644
--- a/drivers/media/dvb-frontends/ves1820.c
+++ b/drivers/media/dvb-frontends/ves1820.c
@@ -366,7 +366,7 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
 	struct ves1820_state* state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct ves1820_state, GFP_KERNEL);
+	state = kzalloc_obj(struct ves1820_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/ves1x93.c b/drivers/media/dvb-frontends/ves1x93.c
index 5c8abcebbd88..304d877f966a 100644
--- a/drivers/media/dvb-frontends/ves1x93.c
+++ b/drivers/media/dvb-frontends/ves1x93.c
@@ -450,7 +450,7 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
 	u8 identity;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct ves1x93_state, GFP_KERNEL);
+	state = kzalloc_obj(struct ves1x93_state);
 	if (state == NULL) goto error;
 
 	/* setup the state */
diff --git a/drivers/media/dvb-frontends/zd1301_demod.c b/drivers/media/dvb-frontends/zd1301_demod.c
index 0c244fd17623..13936a311e56 100644
--- a/drivers/media/dvb-frontends/zd1301_demod.c
+++ b/drivers/media/dvb-frontends/zd1301_demod.c
@@ -470,7 +470,7 @@ static int zd1301_demod_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/media/dvb-frontends/zl10036.c b/drivers/media/dvb-frontends/zl10036.c
index 3d05828e499a..88ca49242925 100644
--- a/drivers/media/dvb-frontends/zl10036.c
+++ b/drivers/media/dvb-frontends/zl10036.c
@@ -457,7 +457,7 @@ struct dvb_frontend *zl10036_attach(struct dvb_frontend *fe,
 		return NULL;
 	}
 
-	state = kzalloc_obj(struct zl10036_state, GFP_KERNEL);
+	state = kzalloc_obj(struct zl10036_state);
 	if (!state)
 		return NULL;
 
diff --git a/drivers/media/dvb-frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c
index 54e1e4267c1d..696831d7544b 100644
--- a/drivers/media/dvb-frontends/zl10039.c
+++ b/drivers/media/dvb-frontends/zl10039.c
@@ -254,7 +254,7 @@ struct dvb_frontend *zl10039_attach(struct dvb_frontend *fe,
 	struct zl10039_state *state = NULL;
 
 	dprintk("%s\n", __func__);
-	state = kmalloc_obj(struct zl10039_state, GFP_KERNEL);
+	state = kmalloc_obj(struct zl10039_state);
 	if (state == NULL)
 		goto error;
 
diff --git a/drivers/media/dvb-frontends/zl10353.c b/drivers/media/dvb-frontends/zl10353.c
index a9f23b142301..6dd8d95651f6 100644
--- a/drivers/media/dvb-frontends/zl10353.c
+++ b/drivers/media/dvb-frontends/zl10353.c
@@ -598,7 +598,7 @@ struct dvb_frontend *zl10353_attach(const struct zl10353_config *config,
 	int id;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(struct zl10353_state, GFP_KERNEL);
+	state = kzalloc_obj(struct zl10353_state);
 	if (state == NULL)
 		goto error;