lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/max8925' into v3.9-rc8

Browse Source
This commit is contained in:
Mark Brown
2013-04-28 02:13:42 +01:00
parent c4578da56a ad4928f1dc
commit 2e1be9f7b3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/max8925-regulator.c
View File

@@ -246,7 +246,6 @@ static struct max8925_regulator_info max8925_regulator_info[] = {
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int max8925_regulator_dt_init(struct platform_device *pdev, static int max8925_regulator_dt_init(struct platform_device *pdev,
struct max8925_regulator_info *info,
struct regulator_config *config, struct regulator_config *config,
int ridx) int ridx)
{ {
@@ -272,7 +271,7 @@ static int max8925_regulator_dt_init(struct platform_device *pdev,
return 0; return 0;
} }
#else #else
#define max8925_regulator_dt_init(w, x, y, z) (-1) #define max8925_regulator_dt_init(x, y, z) (-1)
#endif #endif
static int max8925_regulator_probe(struct platform_device *pdev) static int max8925_regulator_probe(struct platform_device *pdev)
@@ -309,7 +308,7 @@ static int max8925_regulator_probe(struct platform_device *pdev)
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.driver_data = ri; config.driver_data = ri;
if (max8925_regulator_dt_init(pdev, ri, &config, regulator_idx)) if (max8925_regulator_dt_init(pdev, &config, regulator_idx))
if (pdata) if (pdata)
config.init_data = pdata; config.init_data = pdata;