| Message ID | 1366279869-23387-5-git-send-email-nobuhiro.iwamatsu.yj@renesas.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 18-04-2013 14:11, Nobuhiro Iwamatsu wrote: > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> [...] > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > index 7de0b0e..af8c225 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c [...] > @@ -2785,17 +2786,21 @@ static int sh_eth_runtime_nop(struct device *dev) > return 0; > } > > -static struct dev_pm_ops sh_eth_dev_pm_ops = { > +static const struct dev_pm_ops sh_eth_dev_pm_ops = { > .runtime_suspend = sh_eth_runtime_nop, > .runtime_resume = sh_eth_runtime_nop, > }; > +#define SH_ETH_PM_OPS &sh_eth_dev_pm_ops scripts/checkpatch.pl would complain here about missing (), I heard. Did you run it? WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, (2013/04/18 23:53), Sergei Shtylyov wrote: > On 18-04-2013 14:11, Nobuhiro Iwamatsu wrote: > >> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> > [...] > >> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c >> index 7de0b0e..af8c225 100644 >> --- a/drivers/net/ethernet/renesas/sh_eth.c >> +++ b/drivers/net/ethernet/renesas/sh_eth.c > [...] >> @@ -2785,17 +2786,21 @@ static int sh_eth_runtime_nop(struct device *dev) >> return 0; >> } >> >> -static struct dev_pm_ops sh_eth_dev_pm_ops = { >> +static const struct dev_pm_ops sh_eth_dev_pm_ops = { >> .runtime_suspend = sh_eth_runtime_nop, >> .runtime_resume = sh_eth_runtime_nop, >> }; >> +#define SH_ETH_PM_OPS &sh_eth_dev_pm_ops > > scripts/checkpatch.pl would complain here about missing (), I heard. > Did you run it? thanks, it had missed, although I was running. I will fix this. Best regards, Nobuhiro -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 7de0b0e..af8c225 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2772,6 +2772,7 @@ static int sh_eth_drv_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM static int sh_eth_runtime_nop(struct device *dev) { /* @@ -2785,17 +2786,21 @@ static int sh_eth_runtime_nop(struct device *dev) return 0; } -static struct dev_pm_ops sh_eth_dev_pm_ops = { +static const struct dev_pm_ops sh_eth_dev_pm_ops = { .runtime_suspend = sh_eth_runtime_nop, .runtime_resume = sh_eth_runtime_nop, }; +#define SH_ETH_PM_OPS &sh_eth_dev_pm_ops +#else +#define SH_ETH_PM_OPS NULL +#endif static struct platform_driver sh_eth_driver = { .probe = sh_eth_drv_probe, .remove = sh_eth_drv_remove, .driver = { .name = CARDNAME, - .pm = &sh_eth_dev_pm_ops, + .pm = SH_ETH_PM_OPS, }, };
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> --- v2: no change. drivers/net/ethernet/renesas/sh_eth.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)