Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / ccp / ccp-dev.c

diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c
index ca29c120b85f99680c096878be775f70be8574d9..861bacc1bb94fb79d4147dec386020ad13282ce8 100644 (file)
--- a/drivers/crypto/ccp/ccp-dev.c
+++ b/drivers/crypto/ccp/ccp-dev.c
@@ -37,7 +37,6 @@ struct ccp_tasklet_data {
        struct ccp_cmd *cmd;
 };
 
-
 static struct ccp_device *ccp_dev;
 static inline struct ccp_device *ccp_get_device(void)
 {
@@ -296,11 +295,9 @@ struct ccp_device *ccp_alloc_struct(struct device *dev)
 {
        struct ccp_device *ccp;
 
-       ccp = kzalloc(sizeof(*ccp), GFP_KERNEL);
-       if (ccp == NULL) {
-               dev_err(dev, "unable to allocate device struct\n");
+       ccp = devm_kzalloc(dev, sizeof(*ccp), GFP_KERNEL);
+       if (!ccp)
                return NULL;
-       }
        ccp->dev = dev;
 
        INIT_LIST_HEAD(&ccp->cmd);