Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3d1d8a7 authored by Markus Elfring's avatar Markus Elfring Committed by Krzysztof Kozlowski
Browse files

ARM: SAMSUNG: Remove printk for failed memory allocation 



Omit an extra message for a memory allocation failure in adc.c and
platformdata.c.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 0640357b

arch/arm/plat-samsung/adc.c

+2 −6
Original line number Diff line number Diff line
@@ -239,10 +239,8 @@ struct s3c_adc_client *s3c_adc_register(struct platform_device *pdev, 
		return ERR_PTR(-EINVAL);



	client = kzalloc(sizeof(struct s3c_adc_client), GFP_KERNEL);

	if (!client) {

		dev_err(&pdev->dev, "no memory for adc client\n");

	if (!client)

		return ERR_PTR(-ENOMEM);

	}



	client->pdev = pdev;

	client->is_ts = is_ts;
@@ -345,10 +343,8 @@ static int s3c_adc_probe(struct platform_device *pdev) 
	unsigned tmp;



	adc = devm_kzalloc(dev, sizeof(struct adc_device), GFP_KERNEL);

	if (adc == NULL) {

		dev_err(dev, "failed to allocate adc_device\n");

	if (!adc)

		return -ENOMEM;

	}



	spin_lock_init(&adc->lock);

arch/arm/plat-samsung/platformdata.c

+1 −3
Original line number Diff line number Diff line
@@ -29,10 +29,8 @@ void __init *s3c_set_platdata(void *pd, size_t pdsize, 
	}



	npd = kmemdup(pd, pdsize, GFP_KERNEL);

	if (!npd) {

		printk(KERN_ERR "%s: cannot clone platform data\n", pdev->name);

	if (!npd)

		return NULL;

	}



	pdev->dev.platform_data = npd;

	return npd;