aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2018-02-16 07:01:45 -0500
committerTejun Heo <tj@kernel.org>2018-02-18 08:24:16 -0500
commit3e342770a22b84c0246719d22c318c22ae2f782a (patch)
tree402ad94aebc7ed34ec4be8c709dc0dea24e5662b
parent533013d69b509b26ff1b38a7d494db54549ac71b (diff)
pata_macio: Delete an error message for a failed memory allocation in two functions
Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/ata/pata_macio.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 0adcb40d2794..9588e685d994 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -1131,11 +1131,9 @@ static int pata_macio_attach(struct macio_dev *mdev,
1131 /* Allocate and init private data structure */ 1131 /* Allocate and init private data structure */
1132 priv = devm_kzalloc(&mdev->ofdev.dev, 1132 priv = devm_kzalloc(&mdev->ofdev.dev,
1133 sizeof(struct pata_macio_priv), GFP_KERNEL); 1133 sizeof(struct pata_macio_priv), GFP_KERNEL);
1134 if (priv == NULL) { 1134 if (!priv)
1135 dev_err(&mdev->ofdev.dev,
1136 "Failed to allocate private memory\n");
1137 return -ENOMEM; 1135 return -ENOMEM;
1138 } 1136
1139 priv->node = of_node_get(mdev->ofdev.dev.of_node); 1137 priv->node = of_node_get(mdev->ofdev.dev.of_node);
1140 priv->mdev = mdev; 1138 priv->mdev = mdev;
1141 priv->dev = &mdev->ofdev.dev; 1139 priv->dev = &mdev->ofdev.dev;
@@ -1277,11 +1275,9 @@ static int pata_macio_pci_attach(struct pci_dev *pdev,
1277 /* Allocate and init private data structure */ 1275 /* Allocate and init private data structure */
1278 priv = devm_kzalloc(&pdev->dev, 1276 priv = devm_kzalloc(&pdev->dev,
1279 sizeof(struct pata_macio_priv), GFP_KERNEL); 1277 sizeof(struct pata_macio_priv), GFP_KERNEL);
1280 if (priv == NULL) { 1278 if (!priv)
1281 dev_err(&pdev->dev,
1282 "Failed to allocate private memory\n");
1283 return -ENOMEM; 1279 return -ENOMEM;
1284 } 1280
1285 priv->node = of_node_get(np); 1281 priv->node = of_node_get(np);
1286 priv->pdev = pdev; 1282 priv->pdev = pdev;
1287 priv->dev = &pdev->dev; 1283 priv->dev = &pdev->dev;