summaryrefslogtreecommitdiff
path: root/drivers/platform/surface
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/platform/surface')
-rw-r--r--drivers/platform/surface/aggregator/bus.c2
-rw-r--r--drivers/platform/surface/aggregator/controller.c2
-rw-r--r--drivers/platform/surface/aggregator/core.c2
-rw-r--r--drivers/platform/surface/surface3_power.c2
-rw-r--r--drivers/platform/surface/surface_aggregator_cdev.c4
-rw-r--r--drivers/platform/surface/surface_dtx.c4
-rw-r--r--drivers/platform/surface/surfacepro3_button.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/platform/surface/aggregator/bus.c b/drivers/platform/surface/aggregator/bus.c
index dba8ca379385..4395331be659 100644
--- a/drivers/platform/surface/aggregator/bus.c
+++ b/drivers/platform/surface/aggregator/bus.c
@@ -83,7 +83,7 @@ struct ssam_device *ssam_device_alloc(struct ssam_controller *ctrl,
{
struct ssam_device *sdev;
- sdev = kzalloc_obj(*sdev, GFP_KERNEL);
+ sdev = kzalloc_obj(*sdev);
if (!sdev)
return NULL;
diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
index 5f1940a186a1..6a8430cb9cbf 100644
--- a/drivers/platform/surface/aggregator/controller.c
+++ b/drivers/platform/surface/aggregator/controller.c
@@ -344,7 +344,7 @@ ssam_nf_refcount_inc(struct ssam_nf *nf, struct ssam_event_registry reg,
}
}
- entry = kzalloc_obj(*entry, GFP_KERNEL);
+ entry = kzalloc_obj(*entry);
if (!entry)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/platform/surface/aggregator/core.c b/drivers/platform/surface/aggregator/core.c
index 9349a1b14ab7..43d5988fb964 100644
--- a/drivers/platform/surface/aggregator/core.c
+++ b/drivers/platform/surface/aggregator/core.c
@@ -652,7 +652,7 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev)
}
/* Allocate controller. */
- ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+ ctrl = kzalloc_obj(*ctrl);
if (!ctrl)
return -ENOMEM;
diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
index b00f52687fa4..94fdddc7f207 100644
--- a/drivers/platform/surface/surface3_power.c
+++ b/drivers/platform/surface/surface3_power.c
@@ -454,7 +454,7 @@ static int mshw0011_install_space_handler(struct i2c_client *client)
if (!adev)
return -ENODEV;
- data = kzalloc_obj(struct mshw0011_handler_data, GFP_KERNEL);
+ data = kzalloc_obj(struct mshw0011_handler_data);
if (!data)
return -ENOMEM;
diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
index 2e4746c700c8..8929937ba9dc 100644
--- a/drivers/platform/surface/surface_aggregator_cdev.c
+++ b/drivers/platform/surface/surface_aggregator_cdev.c
@@ -154,7 +154,7 @@ static int ssam_cdev_notifier_register(struct ssam_cdev_client *client, u8 tc, i
}
/* Allocate new notifier. */
- nf = kzalloc_obj(*nf, GFP_KERNEL);
+ nf = kzalloc_obj(*nf);
if (!nf) {
mutex_unlock(&client->notifier_lock);
return -ENOMEM;
@@ -685,7 +685,7 @@ static int ssam_dbg_device_probe(struct platform_device *pdev)
if (IS_ERR(ctrl))
return PTR_ERR(ctrl) == -ENODEV ? -EPROBE_DEFER : PTR_ERR(ctrl);
- cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+ cdev = kzalloc_obj(*cdev);
if (!cdev)
return -ENOMEM;
diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
index 43a8c23b2bf0..d6cd56970479 100644
--- a/drivers/platform/surface/surface_dtx.c
+++ b/drivers/platform/surface/surface_dtx.c
@@ -403,7 +403,7 @@ static int surface_dtx_open(struct inode *inode, struct file *file)
struct sdtx_client *client;
/* Initialize client. */
- client = kzalloc_obj(*client, GFP_KERNEL);
+ client = kzalloc_obj(*client);
if (!client)
return -ENOMEM;
@@ -1044,7 +1044,7 @@ static struct sdtx_device *sdtx_device_create(struct device *dev, struct ssam_co
struct sdtx_device *ddev;
int status;
- ddev = kzalloc_obj(*ddev, GFP_KERNEL);
+ ddev = kzalloc_obj(*ddev);
if (!ddev)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
index 28386780177c..9bd39f09c7db 100644
--- a/drivers/platform/surface/surfacepro3_button.c
+++ b/drivers/platform/surface/surfacepro3_button.c
@@ -199,7 +199,7 @@ static int surface_button_add(struct acpi_device *device)
if (!surface_button_check_MSHW0040(device))
return -ENODEV;
- button = kzalloc_obj(struct surface_button, GFP_KERNEL);
+ button = kzalloc_obj(struct surface_button);
if (!button)
return -ENOMEM;