| Message ID | 1403095063-22843-1-git-send-email-gregory.clement@free-electrons.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wednesday, June 18, 2014 02:37:43 PM Gregory CLEMENT wrote: > The length name of the states 2 was too long to fit in the allocated > string (limited to 16 bytes). This lead to improper string displayed > through sysfs. > > This patch shorten the name by removing the reference to Marvell and > to the CPU as both are implicit. For coherency the same change have > been done for the states 1. > > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > Hi, > > This fix should be merged in 3.16. Applied, thanks! > drivers/cpuidle/cpuidle-armada-370-xp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpuidle/cpuidle-armada-370-xp.c b/drivers/cpuidle/cpuidle-armada-370-xp.c > index 28587d0f3947..a5fba0287bfb 100644 > --- a/drivers/cpuidle/cpuidle-armada-370-xp.c > +++ b/drivers/cpuidle/cpuidle-armada-370-xp.c > @@ -55,7 +55,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = { > .power_usage = 50, > .target_residency = 100, > .flags = CPUIDLE_FLAG_TIME_VALID, > - .name = "MV CPU IDLE", > + .name = "Idle", > .desc = "CPU power down", > }, > .states[2] = { > @@ -65,7 +65,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = { > .target_residency = 1000, > .flags = CPUIDLE_FLAG_TIME_VALID | > ARMADA_370_XP_FLAG_DEEP_IDLE, > - .name = "MV CPU DEEP IDLE", > + .name = "Deep idle", > .desc = "CPU and L2 Fabric power down", > }, > .state_count = ARMADA_370_XP_MAX_STATES, >
diff --git a/drivers/cpuidle/cpuidle-armada-370-xp.c b/drivers/cpuidle/cpuidle-armada-370-xp.c index 28587d0f3947..a5fba0287bfb 100644 --- a/drivers/cpuidle/cpuidle-armada-370-xp.c +++ b/drivers/cpuidle/cpuidle-armada-370-xp.c @@ -55,7 +55,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = { .power_usage = 50, .target_residency = 100, .flags = CPUIDLE_FLAG_TIME_VALID, - .name = "MV CPU IDLE", + .name = "Idle", .desc = "CPU power down", }, .states[2] = { @@ -65,7 +65,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = { .target_residency = 1000, .flags = CPUIDLE_FLAG_TIME_VALID | ARMADA_370_XP_FLAG_DEEP_IDLE, - .name = "MV CPU DEEP IDLE", + .name = "Deep idle", .desc = "CPU and L2 Fabric power down", }, .state_count = ARMADA_370_XP_MAX_STATES,
The length name of the states 2 was too long to fit in the allocated string (limited to 16 bytes). This lead to improper string displayed through sysfs. This patch shorten the name by removing the reference to Marvell and to the CPU as both are implicit. For coherency the same change have been done for the states 1. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> --- Hi, This fix should be merged in 3.16. Thanks, Gregory drivers/cpuidle/cpuidle-armada-370-xp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)