diff options
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/ds2490.c | 2 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_ds2433.c | 2 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_ds28e04.c | 2 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_therm.c | 2 | ||||
| -rw-r--r-- | drivers/w1/w1.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 68501b0a2c4d..35e75d07ef5d 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c @@ -1018,7 +1018,7 @@ static int ds_probe(struct usb_interface *intf, struct ds_device *dev; int i, err, alt; - dev = kzalloc_obj(struct ds_device, GFP_KERNEL); + dev = kzalloc_obj(struct ds_device); if (!dev) return -ENOMEM; diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index 54d78060d6ff..ff61ea4f2030 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c @@ -320,7 +320,7 @@ static int w1_f23_add_slave(struct w1_slave *sl) { struct w1_f23_data *data; - data = kzalloc_obj(struct w1_f23_data, GFP_KERNEL); + data = kzalloc_obj(struct w1_f23_data); if (!data) return -ENOMEM; diff --git a/drivers/w1/slaves/w1_ds28e04.c b/drivers/w1/slaves/w1_ds28e04.c index cb198414d47b..3b3c0789e1ad 100644 --- a/drivers/w1/slaves/w1_ds28e04.c +++ b/drivers/w1/slaves/w1_ds28e04.c @@ -384,7 +384,7 @@ static int w1_f1C_add_slave(struct w1_slave *sl) struct w1_f1C_data *data = NULL; if (w1_enable_crccheck) { - data = kzalloc_obj(struct w1_f1C_data, GFP_KERNEL); + data = kzalloc_obj(struct w1_f1C_data); if (!data) return -ENOMEM; sl->family_data = data; diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index f72e9b57fe79..d96b224e2215 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -973,7 +973,7 @@ static int w1_therm_add_slave(struct w1_slave *sl) struct w1_therm_family_converter *sl_family_conv; /* Allocate memory */ - sl->family_data = kzalloc_obj(struct w1_therm_family_data, GFP_KERNEL); + sl->family_data = kzalloc_obj(struct w1_therm_family_data); if (!sl->family_data) return -ENOMEM; diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index a08d5b420f31..486f321eadc8 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -715,7 +715,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) int err; struct w1_netlink_msg msg; - sl = kzalloc_obj(struct w1_slave, GFP_KERNEL); + sl = kzalloc_obj(struct w1_slave); if (!sl) { dev_err(&dev->dev, "%s: failed to allocate new slave device.\n", |