summaryrefslogtreecommitdiff
path: root/drivers/ssb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/bridge_pcmcia_80211.c2
-rw-r--r--drivers/ssb/driver_gige.c2
-rw-r--r--drivers/ssb/main.c2
-rw-r--r--drivers/ssb/pcihost_wrapper.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ssb/bridge_pcmcia_80211.c b/drivers/ssb/bridge_pcmcia_80211.c
index 6e958e403dbe..689ff069ff37 100644
--- a/drivers/ssb/bridge_pcmcia_80211.c
+++ b/drivers/ssb/bridge_pcmcia_80211.c
@@ -31,7 +31,7 @@ static int ssb_host_pcmcia_probe(struct pcmcia_device *dev)
int err = -ENOMEM;
int res = 0;
- ssb = kzalloc_obj(*ssb, GFP_KERNEL);
+ ssb = kzalloc_obj(*ssb);
if (!ssb)
goto out_error;
diff --git a/drivers/ssb/driver_gige.c b/drivers/ssb/driver_gige.c
index fc2bf4ceedee..0aca0711807b 100644
--- a/drivers/ssb/driver_gige.c
+++ b/drivers/ssb/driver_gige.c
@@ -173,7 +173,7 @@ static int ssb_gige_probe(struct ssb_device *sdev,
struct ssb_gige *dev;
u32 base, tmslow, tmshigh;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
return -ENOMEM;
dev->dev = sdev;
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index bb52e5197b1f..b2d339eb57d5 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -481,7 +481,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
continue;
}
- devwrap = kzalloc_obj(*devwrap, GFP_KERNEL);
+ devwrap = kzalloc_obj(*devwrap);
if (!devwrap) {
err = -ENOMEM;
goto error;
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
index 36011a93f5af..5b6b5e0e4433 100644
--- a/drivers/ssb/pcihost_wrapper.c
+++ b/drivers/ssb/pcihost_wrapper.c
@@ -71,7 +71,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
int err = -ENOMEM;
u32 val;
- ssb = kzalloc_obj(*ssb, GFP_KERNEL);
+ ssb = kzalloc_obj(*ssb);
if (!ssb)
goto out;
err = pci_enable_device(dev);