From: Olaf Hering <[email protected]>
This is needed to get kde-powersave to work properly on some g4
powerbooks.
From: Olaf Hering <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
This has been shipping in the SuSE kernels for a while. I do not know
why it was not sent to you previously, sorry - gregkh
drivers/leds/leds-cobalt-qube.c | 2 +-
drivers/leds/leds-cobalt-raq.c | 4 ++--
drivers/leds/ledtrig-default-on.c | 2 +-
drivers/macintosh/via-pmu-led.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
@@ -28,7 +28,7 @@ static void qube_front_led_set(struct le
}
static struct led_classdev qube_front_led = {
- .name = "qube-front",
+ .name = "qube::front",
.brightness = LED_FULL,
.brightness_set = qube_front_led_set,
.default_trigger = "ide-disk",
--- a/drivers/leds/leds-cobalt-raq.c
+++ b/drivers/leds/leds-cobalt-raq.c
@@ -49,7 +49,7 @@ static void raq_web_led_set(struct led_c
}
static struct led_classdev raq_web_led = {
- .name = "raq-web",
+ .name = "raq::web",
.brightness_set = raq_web_led_set,
};
@@ -70,7 +70,7 @@ static void raq_power_off_led_set(struct
}
static struct led_classdev raq_power_off_led = {
- .name = "raq-power-off",
+ .name = "raq::power-off",
.brightness_set = raq_power_off_led_set,
.default_trigger = "power-off",
};
--- a/drivers/leds/ledtrig-default-on.c
+++ b/drivers/leds/ledtrig-default-on.c
@@ -23,7 +23,7 @@ static void defon_trig_activate(struct l
}
static struct led_trigger defon_led_trigger = {
- .name = "default-on",
+ .name = "default::on",
.activate = defon_trig_activate,
};
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -72,7 +72,7 @@ static void pmu_led_set(struct led_class
}
static struct led_classdev pmu_led = {
- .name = "pmu-front-led",
+ .name = "pmu-led::front",
#ifdef CONFIG_ADB_PMU_LED_IDE
.default_trigger = "ide-disk",
#endif
On Wed, 2009-06-24 at 15:33 -0700, Greg KH wrote:
> From: Olaf Hering <[email protected]>
>
> This is needed to get kde-powersave to work properly on some g4
> powerbooks.
>
> From: Olaf Hering <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
I'm ok with this apart from:
> --- a/drivers/leds/ledtrig-default-on.c
> +++ b/drivers/leds/ledtrig-default-on.c
> @@ -23,7 +23,7 @@ static void defon_trig_activate(struct l
> }
>
> static struct led_trigger defon_led_trigger = {
> - .name = "default-on",
> + .name = "default::on",
> .activate = defon_trig_activate,
> };
which doesn't seem to match the patch description. Why does the trigger
name need to be changed?
Cheers,
Richard
--
Richard Purdie
Intel Open Source Technology Centre
On Thu, Jun 25, 2009 at 11:57:55AM +0100, Richard Purdie wrote:
> On Wed, 2009-06-24 at 15:33 -0700, Greg KH wrote:
> > From: Olaf Hering <[email protected]>
> >
> > This is needed to get kde-powersave to work properly on some g4
> > powerbooks.
> >
> > From: Olaf Hering <[email protected]>
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> I'm ok with this apart from:
>
> > --- a/drivers/leds/ledtrig-default-on.c
> > +++ b/drivers/leds/ledtrig-default-on.c
> > @@ -23,7 +23,7 @@ static void defon_trig_activate(struct l
> > }
> >
> > static struct led_trigger defon_led_trigger = {
> > - .name = "default-on",
> > + .name = "default::on",
> > .activate = defon_trig_activate,
> > };
>
> which doesn't seem to match the patch description. Why does the trigger
> name need to be changed?
I really don't know, I took this patch from the suse tree, and Olaf is
gone and I can't ask him :(
If you don't think it is needed/correct, please drop that part. Or I
can redo it without it.
thanks,
greg k-h
On Thu, 2009-06-25 at 19:46 -0700, Greg KH wrote:
> On Thu, Jun 25, 2009 at 11:57:55AM +0100, Richard Purdie wrote:
> > On Wed, 2009-06-24 at 15:33 -0700, Greg KH wrote:
> > > From: Olaf Hering <[email protected]>
> > >
> > > This is needed to get kde-powersave to work properly on some g4
> > > powerbooks.
> > >
> > > From: Olaf Hering <[email protected]>
> > > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> >
> > I'm ok with this apart from:
> >
> > > --- a/drivers/leds/ledtrig-default-on.c
> > > +++ b/drivers/leds/ledtrig-default-on.c
> > > @@ -23,7 +23,7 @@ static void defon_trig_activate(struct l
> > > }
> > >
> > > static struct led_trigger defon_led_trigger = {
> > > - .name = "default-on",
> > > + .name = "default::on",
> > > .activate = defon_trig_activate,
> > > };
> >
> > which doesn't seem to match the patch description. Why does the trigger
> > name need to be changed?
>
> I really don't know, I took this patch from the suse tree, and Olaf is
> gone and I can't ask him :(
>
> If you don't think it is needed/correct, please drop that part. Or I
> can redo it without it.
I'll just drop that bit. As far as I can see it would just break any
users of that trigger for no good reason...
Cheers,
Richard
--
Richard Purdie
Intel Open Source Technology Centre
On Fri, Jun 26, 2009 at 11:01:27AM +0100, Richard Purdie wrote:
> On Thu, 2009-06-25 at 19:46 -0700, Greg KH wrote:
> > On Thu, Jun 25, 2009 at 11:57:55AM +0100, Richard Purdie wrote:
> > > On Wed, 2009-06-24 at 15:33 -0700, Greg KH wrote:
> > > > From: Olaf Hering <[email protected]>
> > > >
> > > > This is needed to get kde-powersave to work properly on some g4
> > > > powerbooks.
> > > >
> > > > From: Olaf Hering <[email protected]>
> > > > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> > >
> > > I'm ok with this apart from:
> > >
> > > > --- a/drivers/leds/ledtrig-default-on.c
> > > > +++ b/drivers/leds/ledtrig-default-on.c
> > > > @@ -23,7 +23,7 @@ static void defon_trig_activate(struct l
> > > > }
> > > >
> > > > static struct led_trigger defon_led_trigger = {
> > > > - .name = "default-on",
> > > > + .name = "default::on",
> > > > .activate = defon_trig_activate,
> > > > };
> > >
> > > which doesn't seem to match the patch description. Why does the trigger
> > > name need to be changed?
> >
> > I really don't know, I took this patch from the suse tree, and Olaf is
> > gone and I can't ask him :(
> >
> > If you don't think it is needed/correct, please drop that part. Or I
> > can redo it without it.
>
> I'll just drop that bit. As far as I can see it would just break any
> users of that trigger for no good reason...
Thanks for dropping it, I'll go change the suse patch as well.
thanks,
greg k-h