Commit 9eb0c421 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: Convert tps65xxx regulator drivers to use devm_kzalloc 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d914d81b

drivers/regulator/tps6507x-regulator.c

+1 −6
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static __devinit int tps6507x_pmic_probe(struct platform_device *pdev) 
	if (!init_data)

		return -EINVAL;



	tps = kzalloc(sizeof(*tps), GFP_KERNEL);

	tps = devm_kzalloc(&pdev->dev, sizeof(*tps), GFP_KERNEL);

	if (!tps)

		return -ENOMEM;
@@ -479,8 +479,6 @@ static __devinit int tps6507x_pmic_probe(struct platform_device *pdev) 
fail:

	while (--i >= 0)

		regulator_unregister(tps->rdev[i]);



	kfree(tps);

	return error;

}
@@ -492,9 +490,6 @@ static int __devexit tps6507x_pmic_remove(struct platform_device *pdev) 


	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++)

		regulator_unregister(tps->rdev[i]);



	kfree(tps);



	return 0;

}

drivers/regulator/tps6524x-regulator.c

+1 −2
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ static int pmic_remove(struct spi_device *spi) 
		hw->rdev[i] = NULL;

	}

	spi_set_drvdata(spi, NULL);

	kfree(hw);

	return 0;

}
@@ -614,7 +613,7 @@ static int __devinit pmic_probe(struct spi_device *spi) 
		return -EINVAL;

	}



	hw = kzalloc(sizeof(struct tps6524x), GFP_KERNEL);

	hw = devm_kzalloc(&spi->dev, sizeof(struct tps6524x), GFP_KERNEL);

	if (!hw) {

		dev_err(dev, "cannot allocate regulator private data\n");

		return -ENOMEM;

drivers/regulator/tps65910-regulator.c

+3 −6
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev) 
	if (!pmic_plat_data)

		return -EINVAL;



	pmic = kzalloc(sizeof(*pmic), GFP_KERNEL);

	pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);

	if (!pmic)

		return -ENOMEM;
@@ -1136,7 +1136,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev) 
		break;

	default:

		pr_err("Invalid tps chip version\n");

		kfree(pmic);

		return -ENODEV;

	}
@@ -1144,7 +1143,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev) 
			sizeof(struct regulator_desc), GFP_KERNEL);

	if (!pmic->desc) {

		err = -ENOMEM;

		goto err_free_pmic;

		goto err_out;

	}



	pmic->info = kcalloc(pmic->num_regulators,
@@ -1233,8 +1232,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev) 
	kfree(pmic->info);

err_free_desc:

	kfree(pmic->desc);

err_free_pmic:

	kfree(pmic);

err_out:

	return err;

}
@@ -1249,7 +1247,6 @@ static int __devexit tps65910_remove(struct platform_device *pdev) 
	kfree(pmic->rdev);

	kfree(pmic->info);

	kfree(pmic->desc);

	kfree(pmic);

	return 0;

}

drivers/regulator/tps65912-regulator.c

+1 −5
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static __devinit int tps65912_probe(struct platform_device *pdev) 


	reg_data = pmic_plat_data->tps65912_pmic_init_data;



	pmic = kzalloc(sizeof(*pmic), GFP_KERNEL);

	pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);

	if (!pmic)

		return -ENOMEM;
@@ -523,8 +523,6 @@ static __devinit int tps65912_probe(struct platform_device *pdev) 
err:

	while (--i >= 0)

		regulator_unregister(pmic->rdev[i]);



	kfree(pmic);

	return err;

}
@@ -535,8 +533,6 @@ static int __devexit tps65912_remove(struct platform_device *pdev) 


	for (i = 0; i < TPS65912_NUM_REGULATOR; i++)

		regulator_unregister(tps65912_reg->rdev[i]);



	kfree(tps65912_reg);

	return 0;

}