From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0116.outbound.protection.outlook.com [157.56.111.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id A26391A01C9 for ; Thu, 24 Dec 2015 15:19:42 +1100 (AEDT) Date: Wed, 23 Dec 2015 22:19:24 -0600 From: Scott Wood To: Raghav Dogra CC: , Subject: Re: [1/2] mpc85xx/lbc: modify suspend/resume entry sequence Message-ID: <20151224041924.GA18543@home.buserror.net> References: <1446186299-2921-1-git-send-email-raghav@freescale.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" In-Reply-To: <1446186299-2921-1-git-send-email-raghav@freescale.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, Oct 30, 2015 at 11:54:59AM +0530, Raghav Dogra wrote: > /* restore lbc registers */ > -static int fsl_lbc_resume(struct platform_device *pdev) > +static int fsl_lbc_syscore_resume(void) > { > - struct fsl_lbc_ctrl *ctrl = dev_get_drvdata(&pdev->dev); > - struct fsl_lbc_regs __iomem *lbc = ctrl->regs; > + struct fsl_lbc_ctrl *ctrl; > + struct fsl_lbc_regs __iomem *lbc; > + > + ctrl = fsl_lbc_ctrl_dev; > + if (!ctrl) > + goto out; > + > + lbc = ctrl->regs; > + if (!lbc) > + goto out; > > if (ctrl->saved_regs) { > _memcpy_toio(lbc, ctrl->saved_regs, > @@ -379,7 +398,9 @@ static int fsl_lbc_resume(struct platform_device *pdev) > kfree(ctrl->saved_regs); > ctrl->saved_regs = NULL; > } > - return 0; > + > +out: > + return; > } arch/powerpc/sysdev/fsl_lbc.c:401:2: error: 'return' with no value, in function returning non-void [-Werror=return-type] > #endif /* CONFIG_SUSPEND */ > > @@ -391,20 +412,26 @@ static const struct of_device_id fsl_lbc_match[] = { > {}, > }; > > +#ifdef CONFIG_SUSPEND > +static struct syscore_ops lbc_syscore_pm_ops = { > + .suspend = fsl_lbc_syscore_suspend, > + .resume = fsl_lbc_syscore_resume, > +}; > +#endif arch/powerpc/sysdev/fsl_lbc.c:416:2: error: initialization from incompatible pointer type [-Werror] arch/powerpc/sysdev/fsl_lbc.c:416:2: error: (near initialization for 'lbc_syscore_pm_ops.resume') [-Werror] -Scott