Re: [2.6 patch] acpi/battery.c: make 2 functions static

Adrian Bunk
2008-03-01T18:37:16Z

On Sat, Mar 01, 2008 at 09:26:41PM +0300, Alexey Starikovskiy wrote:
> May I keep them inline?

The problem with such manual inlines is that we force gcc to always
inline them - and history has shown that functions grow without the
"inline" being removed.

And for static functions gcc should (at least in theory) know best when
to inline them.

> Thanks,
> Alex.
> Adrian Bunk wrote:
>> This patch makes the following functions static instead of global inline:
>> - acpi_battery_present()
>> - acpi_battery_units()
>>
>> Signed-off-by: Adrian Bunk <bunk@kernel.org>
>>
>> ---
>>
>> drivers/acpi/battery.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> 9cfc2b0a3162d8e2f23537faefb6937c97513f38 foobar
>> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
>> index f6215e8..d941c5a 100644
>> --- a/drivers/acpi/battery.c
>> +++ b/drivers/acpi/battery.c
>> @@ -116,7 +116,7 @@ struct acpi_battery {
>> #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
>> -inline int acpi_battery_present(struct acpi_battery *battery)
>> +static int acpi_battery_present(struct acpi_battery *battery)
>> {
>> return battery->device->status.battery_present;
>> }
>> @@ -235,7 +235,7 @@ static enum power_supply_property energy_battery_props[] = {
>> #endif
>> #ifdef CONFIG_ACPI_PROCFS_POWER
>> -inline char *acpi_battery_units(struct acpi_battery *battery)
>> +static char *acpi_battery_units(struct acpi_battery *battery)
>> {
>> return (battery->power_unit)?"mA":"mW";
>> }

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed