summaryrefslogtreecommitdiff
path: root/drivers/tty/ipwireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/ipwireless')
-rw-r--r--drivers/tty/ipwireless/hardware.c2
-rw-r--r--drivers/tty/ipwireless/main.c2
-rw-r--r--drivers/tty/ipwireless/network.c4
-rw-r--r--drivers/tty/ipwireless/tty.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c
index 6e6aa90b33ba..0bfcbca6e2df 100644
--- a/drivers/tty/ipwireless/hardware.c
+++ b/drivers/tty/ipwireless/hardware.c
@@ -1618,7 +1618,7 @@ struct ipw_hardware *ipwireless_hardware_create(void)
{
int i;
struct ipw_hardware *hw =
- kzalloc_obj(struct ipw_hardware, GFP_KERNEL);
+ kzalloc_obj(struct ipw_hardware);
if (!hw)
return NULL;
diff --git a/drivers/tty/ipwireless/main.c b/drivers/tty/ipwireless/main.c
index 3bf160d62a1e..a2875823290e 100644
--- a/drivers/tty/ipwireless/main.c
+++ b/drivers/tty/ipwireless/main.c
@@ -267,7 +267,7 @@ static int ipwireless_attach(struct pcmcia_device *link)
struct ipw_dev *ipw;
int ret;
- ipw = kzalloc_obj(struct ipw_dev, GFP_KERNEL);
+ ipw = kzalloc_obj(struct ipw_dev);
if (!ipw)
return -ENOMEM;
diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c
index cb864142be09..ad2c5157a018 100644
--- a/drivers/tty/ipwireless/network.c
+++ b/drivers/tty/ipwireless/network.c
@@ -257,7 +257,7 @@ static void do_go_online(struct work_struct *work_go_online)
struct ppp_channel *channel;
spin_unlock_irqrestore(&network->lock, flags);
- channel = kzalloc_obj(struct ppp_channel, GFP_KERNEL);
+ channel = kzalloc_obj(struct ppp_channel);
if (!channel) {
printk(KERN_ERR IPWIRELESS_PCCARD_NAME
": unable to allocate PPP channel\n");
@@ -416,7 +416,7 @@ void ipwireless_network_packet_received(struct ipw_network *network,
struct ipw_network *ipwireless_network_create(struct ipw_hardware *hw)
{
struct ipw_network *network =
- kzalloc_obj(struct ipw_network, GFP_KERNEL);
+ kzalloc_obj(struct ipw_network);
if (!network)
return NULL;
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index 79c01ff49c65..ffdbcdd041a3 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -437,7 +437,7 @@ static int add_tty(int j,
struct ipw_network *network, int channel_idx,
int secondary_channel_idx, int tty_type)
{
- ttys[j] = kzalloc_obj(struct ipw_tty, GFP_KERNEL);
+ ttys[j] = kzalloc_obj(struct ipw_tty);
if (!ttys[j])
return -ENOMEM;
ttys[j]->index = j;