summaryrefslogtreecommitdiff
path: root/drivers/ipack
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ipack')
-rw-r--r--drivers/ipack/carriers/tpci200.c8
-rw-r--r--drivers/ipack/devices/ipoctal.c2
-rw-r--r--drivers/ipack/ipack.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c
index 6d1058dc8faa..341fde71356e 100644
--- a/drivers/ipack/carriers/tpci200.c
+++ b/drivers/ipack/carriers/tpci200.c
@@ -209,7 +209,7 @@ static int tpci200_request_irq(struct ipack_device *dev,
goto out_unlock;
}
- slot_irq = kzalloc_obj(struct slot_irq, GFP_KERNEL);
+ slot_irq = kzalloc_obj(struct slot_irq);
if (slot_irq == NULL) {
dev_err(&dev->dev,
"Slot [%d:%d] unable to allocate memory for IRQ !\n",
@@ -487,7 +487,7 @@ static int tpci200_create_device(struct tpci200_board *tpci200, int i)
int ret;
enum ipack_space space;
struct ipack_device *dev =
- kzalloc_obj(struct ipack_device, GFP_KERNEL);
+ kzalloc_obj(struct ipack_device);
if (!dev)
return -ENOMEM;
dev->slot = i;
@@ -521,11 +521,11 @@ static int tpci200_pci_probe(struct pci_dev *pdev,
struct tpci200_board *tpci200;
u32 reg32;
- tpci200 = kzalloc_obj(struct tpci200_board, GFP_KERNEL);
+ tpci200 = kzalloc_obj(struct tpci200_board);
if (!tpci200)
return -ENOMEM;
- tpci200->info = kzalloc_obj(struct tpci200_infos, GFP_KERNEL);
+ tpci200->info = kzalloc_obj(struct tpci200_infos);
if (!tpci200->info) {
ret = -ENOMEM;
goto err_tpci200;
diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
index 563fdf197101..1bbefc6de708 100644
--- a/drivers/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
@@ -688,7 +688,7 @@ static int ipoctal_probe(struct ipack_device *dev)
int res;
struct ipoctal *ipoctal;
- ipoctal = kzalloc_obj(struct ipoctal, GFP_KERNEL);
+ ipoctal = kzalloc_obj(struct ipoctal);
if (ipoctal == NULL)
return -ENOMEM;
diff --git a/drivers/ipack/ipack.c b/drivers/ipack/ipack.c
index d4ec786bf98d..28214f862ab1 100644
--- a/drivers/ipack/ipack.c
+++ b/drivers/ipack/ipack.c
@@ -203,7 +203,7 @@ struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots,
int bus_nr;
struct ipack_bus_device *bus;
- bus = kzalloc_obj(*bus, GFP_KERNEL);
+ bus = kzalloc_obj(*bus);
if (!bus)
return NULL;