Skip to content

Commit d5a91d7

Browse files
Lv Zhengrafaeljw
Lv Zheng
authored and
rafaeljw
committed
ACPI / osi: Cleanup coding style issues before creating a separate OSI source file
This patch performs necessary cleanups before moving OSI support to another file. 1. Change printk into pr_xxx 2. Do not initialize values to 0 3. Do not append additional "return" at the end of the function 4. Remove useless comments which may easily break line breaking rule After fixing the coding style issues, rename functions to make them looking like acpi_osi_xxx. No functional changes. Tested-by: Lukas Wunner <[email protected]> Tested-by: Chen Yu <[email protected]> Signed-off-by: Lv Zheng <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent dc45eb2 commit d5a91d7

File tree

3 files changed

+38
-52
lines changed

3 files changed

+38
-52
lines changed

‎drivers/acpi/blacklist.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,31 +135,31 @@ int __init acpi_blacklisted(void)
135135
#ifdef CONFIG_DMI
136136
static int __init dmi_enable_osi_darwin(const struct dmi_system_id *d)
137137
{
138-
acpi_dmi_osi_darwin(true, d); /* enable */
138+
acpi_osi_dmi_darwin(true, d);
139139
return 0;
140140
}
141141
static int __init dmi_enable_osi_linux(const struct dmi_system_id *d)
142142
{
143-
acpi_dmi_osi_linux(true, d); /* enable */
143+
acpi_osi_dmi_linux(true, d);
144144
return 0;
145145
}
146146
static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)
147147
{
148-
printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
148+
pr_notice(PREFIX "DMI detected: %s\n", d->ident);
149149
acpi_osi_setup("!Windows 2006");
150150
acpi_osi_setup("!Windows 2006 SP1");
151151
acpi_osi_setup("!Windows 2006 SP2");
152152
return 0;
153153
}
154154
static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)
155155
{
156-
printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
156+
pr_notice(PREFIX "DMI detected: %s\n", d->ident);
157157
acpi_osi_setup("!Windows 2009");
158158
return 0;
159159
}
160160
static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
161161
{
162-
printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
162+
pr_notice(PREFIX "DMI detected: %s\n", d->ident);
163163
acpi_osi_setup("!Windows 2012");
164164
return 0;
165165
}

‎drivers/acpi/osl.c

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ static struct acpi_osi_config {
139139
unsigned int darwin_dmi:1;
140140
unsigned int darwin_cmdline:1;
141141
u8 default_disabling;
142-
} osi_config = {0, 0, 0, 0};
142+
} osi_config;
143143

144144
static u32 acpi_osi_handler(acpi_string interface, u32 supported)
145145
{
146146
if (!strcmp("Linux", interface)) {
147147

148-
printk_once(KERN_NOTICE FW_BUG PREFIX
148+
pr_notice_once(FW_BUG PREFIX
149149
"BIOS _OSI(Linux) query %s%s\n",
150150
osi_config.linux_enable ? "honored" : "ignored",
151151
osi_config.linux_cmdline ? " via cmdline" :
@@ -154,7 +154,7 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported)
154154

155155
if (!strcmp("Darwin", interface)) {
156156

157-
printk_once(KERN_NOTICE PREFIX
157+
pr_notice_once(PREFIX
158158
"BIOS _OSI(Darwin) query %s%s\n",
159159
osi_config.darwin_enable ? "honored" : "ignored",
160160
osi_config.darwin_cmdline ? " via cmdline" :
@@ -1719,15 +1719,15 @@ static int __init acpi_os_name_setup(char *str)
17191719

17201720
__setup("acpi_os_name=", acpi_os_name_setup);
17211721

1722-
#define OSI_STRING_LENGTH_MAX 64 /* arbitrary */
1723-
#define OSI_STRING_ENTRIES_MAX 16 /* arbitrary */
1722+
#define OSI_STRING_LENGTH_MAX 64
1723+
#define OSI_STRING_ENTRIES_MAX 16
17241724

1725-
struct osi_setup_entry {
1725+
struct acpi_osi_entry {
17261726
char string[OSI_STRING_LENGTH_MAX];
17271727
bool enable;
17281728
};
17291729

1730-
static struct osi_setup_entry
1730+
static struct acpi_osi_entry
17311731
osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = {
17321732
{"Module Device", true},
17331733
{"Processor Device", true},
@@ -1737,15 +1737,15 @@ static struct osi_setup_entry
17371737

17381738
void __init acpi_osi_setup(char *str)
17391739
{
1740-
struct osi_setup_entry *osi;
1740+
struct acpi_osi_entry *osi;
17411741
bool enable = true;
17421742
int i;
17431743

17441744
if (!acpi_gbl_create_osi_method)
17451745
return;
17461746

17471747
if (str == NULL || *str == '\0') {
1748-
printk(KERN_INFO PREFIX "_OSI method disabled\n");
1748+
pr_info(PREFIX "_OSI method disabled\n");
17491749
acpi_gbl_create_osi_method = FALSE;
17501750
return;
17511751
}
@@ -1785,7 +1785,7 @@ void __init acpi_osi_setup(char *str)
17851785
}
17861786
}
17871787

1788-
static void __init set_osi_darwin(bool enable)
1788+
static void __init __acpi_osi_setup_darwin(bool enable)
17891789
{
17901790
osi_config.darwin_enable = !!enable;
17911791
if (enable) {
@@ -1797,57 +1797,43 @@ static void __init set_osi_darwin(bool enable)
17971797
}
17981798
}
17991799

1800-
static void __init acpi_cmdline_osi_darwin(bool enable)
1800+
static void __init acpi_osi_setup_darwin(bool enable)
18011801
{
1802-
/* cmdline set the default and override DMI */
18031802
osi_config.darwin_cmdline = 1;
18041803
osi_config.darwin_dmi = 0;
1805-
set_osi_darwin(enable);
1806-
1807-
return;
1804+
__acpi_osi_setup_darwin(enable);
18081805
}
18091806

1810-
void __init acpi_dmi_osi_darwin(bool enable, const struct dmi_system_id *d)
1807+
void __init acpi_osi_dmi_darwin(bool enable, const struct dmi_system_id *d)
18111808
{
1812-
printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
1813-
1814-
/* DMI knows that this box asks OSI(Darwin) */
1809+
pr_notice(PREFIX "DMI detected to setup _OSI(\"Darwin\"): %s\n",
1810+
d->ident);
18151811
osi_config.darwin_dmi = 1;
1816-
set_osi_darwin(enable);
1817-
1818-
return;
1812+
__acpi_osi_setup_darwin(enable);
18191813
}
18201814

1821-
static void __init set_osi_linux(bool enable)
1815+
static void __init __acpi_osi_setup_linux(bool enable)
18221816
{
18231817
osi_config.linux_enable = !!enable;
18241818
if (enable)
18251819
acpi_osi_setup("Linux");
18261820
else
18271821
acpi_osi_setup("!Linux");
1828-
1829-
return;
18301822
}
18311823

1832-
static void __init acpi_cmdline_osi_linux(bool enable)
1824+
static void __init acpi_osi_setup_linux(bool enable)
18331825
{
1834-
/* cmdline set the default and override DMI */
18351826
osi_config.linux_cmdline = 1;
18361827
osi_config.linux_dmi = 0;
1837-
set_osi_linux(enable);
1838-
1839-
return;
1828+
__acpi_osi_setup_linux(enable);
18401829
}
18411830

1842-
void __init acpi_dmi_osi_linux(bool enable, const struct dmi_system_id *d)
1831+
void __init acpi_osi_dmi_linux(bool enable, const struct dmi_system_id *d)
18431832
{
1844-
printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
1845-
1846-
/* DMI knows that this box asks OSI(Linux) */
1833+
pr_notice(PREFIX "DMI detected to setup _OSI(\"Linux\"): %s\n",
1834+
d->ident);
18471835
osi_config.linux_dmi = 1;
1848-
set_osi_linux(enable);
1849-
1850-
return;
1836+
__acpi_osi_setup_linux(enable);
18511837
}
18521838

18531839
/*
@@ -1859,7 +1845,7 @@ void __init acpi_dmi_osi_linux(bool enable, const struct dmi_system_id *d)
18591845
*/
18601846
static void __init acpi_osi_setup_late(void)
18611847
{
1862-
struct osi_setup_entry *osi;
1848+
struct acpi_osi_entry *osi;
18631849
char *str;
18641850
int i;
18651851
acpi_status status;
@@ -1868,7 +1854,7 @@ static void __init acpi_osi_setup_late(void)
18681854
status = acpi_update_interfaces(osi_config.default_disabling);
18691855

18701856
if (ACPI_SUCCESS(status))
1871-
printk(KERN_INFO PREFIX "Disabled all _OSI OS vendors%s\n",
1857+
pr_info(PREFIX "Disabled all _OSI OS vendors%s\n",
18721858
osi_config.default_disabling ==
18731859
ACPI_DISABLE_ALL_STRINGS ?
18741860
" and feature groups" : "");
@@ -1884,26 +1870,26 @@ static void __init acpi_osi_setup_late(void)
18841870
status = acpi_install_interface(str);
18851871

18861872
if (ACPI_SUCCESS(status))
1887-
printk(KERN_INFO PREFIX "Added _OSI(%s)\n", str);
1873+
pr_info(PREFIX "Added _OSI(%s)\n", str);
18881874
} else {
18891875
status = acpi_remove_interface(str);
18901876

18911877
if (ACPI_SUCCESS(status))
1892-
printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
1878+
pr_info(PREFIX "Deleted _OSI(%s)\n", str);
18931879
}
18941880
}
18951881
}
18961882

18971883
static int __init osi_setup(char *str)
18981884
{
18991885
if (str && !strcmp("Linux", str))
1900-
acpi_cmdline_osi_linux(true);
1886+
acpi_osi_setup_linux(true);
19011887
else if (str && !strcmp("!Linux", str))
1902-
acpi_cmdline_osi_linux(false);
1888+
acpi_osi_setup_linux(false);
19031889
else if (str && !strcmp("Darwin", str))
1904-
acpi_cmdline_osi_darwin(true);
1890+
acpi_osi_setup_darwin(true);
19051891
else if (str && !strcmp("!Darwin", str))
1906-
acpi_cmdline_osi_darwin(false);
1892+
acpi_osi_setup_darwin(false);
19071893
else
19081894
acpi_osi_setup(str);
19091895

‎include/linux/acpi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ extern bool wmi_has_guid(const char *guid);
359359
extern char acpi_video_backlight_string[];
360360
extern long acpi_is_video_device(acpi_handle handle);
361361
extern int acpi_blacklisted(void);
362-
extern void acpi_dmi_osi_linux(bool enable, const struct dmi_system_id *d);
363-
extern void acpi_dmi_osi_darwin(bool enable, const struct dmi_system_id *d);
362+
extern void acpi_osi_dmi_linux(bool enable, const struct dmi_system_id *d);
363+
extern void acpi_osi_dmi_darwin(bool enable, const struct dmi_system_id *d);
364364
extern void acpi_osi_setup(char *str);
365365
extern bool acpi_osi_is_win8(void);
366366

0 commit comments

Comments
 (0)