3.16.50-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Mark Brown <[email protected]> commit d3ed534cca703b2aaeee9277a5b8063ae6eab1d1 upstream. The xgene-reset driver uses xgene_restart() as arm_pm_restart() but that function should take an enum reset_type as the first argument rather than a char. Fix this; the paramter is not referenced in the implementation. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Sebastian Reichel <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- drivers/power/reset/xgene-reboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/power/reset/xgene-reboot.c +++ b/drivers/power/reset/xgene-reboot.c @@ -40,7 +40,7 @@ struct xgene_reboot_context { static struct xgene_reboot_context *xgene_restart_ctx; -static void xgene_restart(char str, const char *cmd) +static void xgene_restart(enum reboot_mode mode, const char *cmd) { struct xgene_reboot_context *ctx = xgene_restart_ctx; unsigned long timeout;
