2007-12-13 21:59:43

by Dave Jones

Subject: Fix implicit declaration in via-pmu.c

drivers/macintosh/via-pmu.c: In function 'register_pmu_pm_ops':
drivers/macintosh/via-pmu.c:2481: error: implicit declaration of function 'pm_set_ops'

Signed-off-by Dave Jones <[email protected]>

--- linux-2.6.23.noarch/drivers/macintosh/via-pmu.c~ 2007-11-07 16:54:46.000000000 -0500
+++ linux-2.6.23.noarch/drivers/macintosh/via-pmu.c 2007-11-07 16:55:02.000000000 -0500
@@ -2469,7 +2469,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}

-static struct pm_ops pmu_pm_ops = {
+static struct platform_suspend_ops pmu_pm_ops = {
.prepare = powerbook_prepare_sleep,
.enter = powerbook_sleep,
.finish = powerbook_finish_sleep,
@@ -2478,7 +2478,7 @@ static struct pm_ops pmu_pm_ops = {

static int register_pmu_pm_ops(void)
{
- pm_set_ops(&pmu_pm_ops);
+ suspend_set_ops(&pmu_pm_ops);

return 0;
}


--
http://www.codemonkey.org.uk

2007-12-14 03:01:39

by Paul Mackerras

Subject: Re: Fix implicit declaration in via-pmu.c

Dave Jones writes:

> drivers/macintosh/via-pmu.c: In function 'register_pmu_pm_ops':
> drivers/macintosh/via-pmu.c:2481: error: implicit declaration of function 'pm_set_ops'

What tree is this against? I don't see any occurrences of pmu_pm_ops
in either 2.6.23 or Linus' current tree, or in my published
powerpc.git tree.

Paul.

2007-12-14 03:13:00

by Dave Jones

Subject: Re: Fix implicit declaration in via-pmu.c

On Fri, Dec 14, 2007 at 02:01:20PM +1100, Paul Mackerras wrote:
> Dave Jones writes:
>
> > drivers/macintosh/via-pmu.c: In function 'register_pmu_pm_ops':
> > drivers/macintosh/via-pmu.c:2481: error: implicit declaration of function 'pm_set_ops'
>
> What tree is this against? I don't see any occurrences of pmu_pm_ops
> in either 2.6.23 or Linus' current tree, or in my published
> powerpc.git tree.

*grmbl*, it's on top of a bunch of other ppc suspend bits.
I blame dwmw2.

You can safely drop this. Thanks.

Dave

--
http://www.codemonkey.org.uk