[<prev] [next>] [day] [month] [year] [list]
Message-Id: <E1ZNiC2-0005kI-Ky@finisterre>
Date: Fri, 07 Aug 2015 15:00:18 +0100
From: Mark Brown <broonie@...nel.org>
To: Nicolas Boichat <drinkcat@...omium.org>,
Mark Brown <broonie@...nel.org>
Cc: linux-kernel@...r.kernel.org
Subject: Applied "thermal: sti: Add parentheses around bridge->ops->regmap_init call" to the regmap tree
The patch
thermal: sti: Add parentheses around bridge->ops->regmap_init call
has been applied to the regmap tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 331a5fc9f2ed28033ddda89acb2a9b43592a545d Mon Sep 17 00:00:00 2001
From: Nicolas Boichat <drinkcat@...omium.org>
Date: Wed, 8 Jul 2015 14:30:17 +0800
Subject: [PATCH] thermal: sti: Add parentheses around bridge->ops->regmap_init
call
regmap_init(...) is a macro since commit
"regmap: Use different lockdep class for each regmap init call".
That same name is used as a function pointer: prevent its expansion
by adding parentheses around the function pointer.
Signed-off-by: Nicolas Boichat <drinkcat@...omium.org>
Signed-off-by: Mark Brown <broonie@...nel.org>
---
drivers/thermal/st/st_thermal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c
index 76c515d..88c759d 100644
--- a/drivers/thermal/st/st_thermal.c
+++ b/drivers/thermal/st/st_thermal.c
@@ -214,7 +214,7 @@ int st_thermal_register(struct platform_device *pdev,
sensor->ops = sensor->cdata->ops;
- ret = sensor->ops->regmap_init(sensor);
+ ret = (sensor->ops->regmap_init)(sensor);
if (ret)
return ret;
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists