Skip to content

L
linux-davinci
Commit 3f4380a1 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files
Options

x86: get rid of checkpatch.pl complains on apm_32.c 

This patch eliminates most of code-style errors
discovered by checkpatch.pl on arch/x86/kernel/apm_32.c

no code changed:

      text    data     bss     dec     hex filename
     12142    1837      84   14063    36ef apm_32.o.before
     12142    1837      84   14063    36ef apm_32.o.after

   md5:
       2676b881ad55e387da4a995e8b9ee372  apm_32.o.before.asm
       2676b881ad55e387da4a995e8b9ee372  apm_32.o.after.asm
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1c858087
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 170 deletions
arch/x86/kernel/apm_32.c
View file @ 3f4380a1
...@@ -335,7 +335,7 @@ extern int (*console_blank_hook)(int); ...@@ -335,7 +335,7 @@ extern int (*console_blank_hook)(int);
*/ */
struct apm_user { struct apm_user {
int magic; int magic;
struct apm_user * next; struct apm_user *next;
unsigned int suser: 1; unsigned int suser: 1;
unsigned int writer: 1; unsigned int writer: 1;
unsigned int reader: 1; unsigned int reader: 1;
...@@ -404,7 +404,7 @@ static int broken_psr; ...@@ -404,7 +404,7 @@ static int broken_psr;
static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue); static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);
static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue); static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
static struct apm_user * user_list; static struct apm_user *user_list;
static DEFINE_SPINLOCK(user_list_lock); static DEFINE_SPINLOCK(user_list_lock);
static const struct desc_struct bad_bios_desc = { { { 0, 0x00409200 } } }; static const struct desc_struct bad_bios_desc = { { { 0, 0x00409200 } } };
...@@ -434,7 +434,7 @@ static const char * const apm_event_name[] = { ...@@ -434,7 +434,7 @@ static const char * const apm_event_name[] = {
typedef struct lookup_t { typedef struct lookup_t {
int key; int key;
char * msg; char *msg;
} lookup_t; } lookup_t;
/* /*
...@@ -477,7 +477,8 @@ static void apm_error(char *str, int err) ...@@ -477,7 +477,8 @@ static void apm_error(char *str, int err)
int i; int i;
for (i = 0; i < ERROR_COUNT; i++) for (i = 0; i < ERROR_COUNT; i++)
if (error_table[i].key == err) break; if (error_table[i].key == err)
break;
if (i < ERROR_COUNT) if (i < ERROR_COUNT)
printk(KERN_NOTICE "apm: %s: %s\n", str, error_table[i].msg); printk(KERN_NOTICE "apm: %s: %s\n", str, error_table[i].msg);
else else
...@@ -798,8 +799,7 @@ static int apm_do_idle(void) ...@@ -798,8 +799,7 @@ static int apm_do_idle(void)
/* This always fails on some SMP boards running UP kernels. /* This always fails on some SMP boards running UP kernels.
* Only report the failure the first 5 times. * Only report the failure the first 5 times.
*/ */
if (++t < 5) if (++t < 5) {
{
printk(KERN_DEBUG "apm_do_idle failed (%d)\n", printk(KERN_DEBUG "apm_do_idle failed (%d)\n",
(eax >> 8) & 0xff); (eax >> 8) & 0xff);
t = jiffies; t = jiffies;
...@@ -821,7 +821,7 @@ static void apm_do_busy(void) ...@@ -821,7 +821,7 @@ static void apm_do_busy(void)
u32 dummy; u32 dummy;
if (clock_slowed || ALWAYS_CALL_BUSY) { if (clock_slowed || ALWAYS_CALL_BUSY) {
(void) apm_bios_call_simple(APM_FUNC_BUSY, 0, 0, &dummy); (void)apm_bios_call_simple(APM_FUNC_BUSY, 0, 0, &dummy);
clock_slowed = 0; clock_slowed = 0;
} }
} }
...@@ -881,7 +881,8 @@ recalc: ...@@ -881,7 +881,8 @@ recalc:
t = jiffies; t = jiffies;
switch (apm_do_idle()) { switch (apm_do_idle()) {
case 0: apm_idle_done = 1; case 0:
apm_idle_done = 1;
if (t != jiffies) { if (t != jiffies) {
if (bucket) { if (bucket) {
bucket = IDLE_LEAKY_MAX; bucket = IDLE_LEAKY_MAX;
...@@ -892,7 +893,8 @@ recalc: ...@@ -892,7 +893,8 @@ recalc:
continue; continue;
} }
break; break;
case 1: apm_idle_done = 1; case 1:
apm_idle_done = 1;
break; break;
default: /* BIOS refused */ default: /* BIOS refused */
break; break;
...@@ -934,13 +936,12 @@ static void apm_power_off(void) ...@@ -934,13 +936,12 @@ static void apm_power_off(void)
}; };
/* Some bioses don't like being called from CPU != 0 */ /* Some bioses don't like being called from CPU != 0 */
if (apm_info.realmode_power_off) if (apm_info.realmode_power_off) {
{
(void)apm_save_cpus(); (void)apm_save_cpus();
machine_real_restart(po_bios_call, sizeof(po_bios_call)); machine_real_restart(po_bios_call, sizeof(po_bios_call));
} else {
(void)set_system_power_state(APM_STATE_OFF);
} }
else
(void) set_system_power_state(APM_STATE_OFF);
} }
#ifdef CONFIG_APM_DO_ENABLE #ifdef CONFIG_APM_DO_ENABLE
...@@ -1125,7 +1126,7 @@ static apm_event_t get_queued_event(struct apm_user *as) ...@@ -1125,7 +1126,7 @@ static apm_event_t get_queued_event(struct apm_user *as)
static void queue_event(apm_event_t event, struct apm_user *sender) static void queue_event(apm_event_t event, struct apm_user *sender)
{ {
struct apm_user * as; struct apm_user *as;
spin_lock(&user_list_lock); spin_lock(&user_list_lock);
if (user_list == NULL) if (user_list == NULL)
...@@ -1356,7 +1357,7 @@ static void check_events(void) ...@@ -1356,7 +1357,7 @@ static void check_events(void)
/* /*
* We are not allowed to reject a critical suspend. * We are not allowed to reject a critical suspend.
*/ */
(void) suspend(0); (void)suspend(0);
break; break;
} }
} }
...@@ -1417,7 +1418,7 @@ static int check_apm_user(struct apm_user *as, const char *func) ...@@ -1417,7 +1418,7 @@ static int check_apm_user(struct apm_user *as, const char *func)
static ssize_t do_read(struct file *fp, char __user *buf, size_t count, loff_t *ppos) static ssize_t do_read(struct file *fp, char __user *buf, size_t count, loff_t *ppos)
{ {
struct apm_user * as; struct apm_user *as;
int i; int i;
apm_event_t event; apm_event_t event;
...@@ -1458,9 +1459,9 @@ static ssize_t do_read(struct file *fp, char __user *buf, size_t count, loff_t * ...@@ -1458,9 +1459,9 @@ static ssize_t do_read(struct file *fp, char __user *buf, size_t count, loff_t *
return 0; return 0;
} }
static unsigned int do_poll(struct file *fp, poll_table * wait) static unsigned int do_poll(struct file *fp, poll_table *wait)
{ {
struct apm_user * as; struct apm_user *as;
as = fp->private_data; as = fp->private_data;
if (check_apm_user(as, "poll")) if (check_apm_user(as, "poll"))
...@@ -1471,10 +1472,10 @@ static unsigned int do_poll(struct file *fp, poll_table * wait) ...@@ -1471,10 +1472,10 @@ static unsigned int do_poll(struct file *fp, poll_table * wait)
return 0; return 0;
} }
static int do_ioctl(struct inode * inode, struct file *filp, static int do_ioctl(struct inode *inode, struct file *filp,
u_int cmd, u_long arg) u_int cmd, u_long arg)
{ {
struct apm_user * as; struct apm_user *as;
as = filp->private_data; as = filp->private_data;
if (check_apm_user(as, "ioctl")) if (check_apm_user(as, "ioctl"))
...@@ -1514,9 +1515,9 @@ static int do_ioctl(struct inode * inode, struct file *filp, ...@@ -1514,9 +1515,9 @@ static int do_ioctl(struct inode * inode, struct file *filp,
return 0; return 0;
} }
static int do_release(struct inode * inode, struct file * filp) static int do_release(struct inode *inode, struct file *filp)
{ {
struct apm_user * as; struct apm_user *as;
as = filp->private_data; as = filp->private_data;
if (check_apm_user(as, "release")) if (check_apm_user(as, "release"))
...@@ -1536,7 +1537,7 @@ static int do_release(struct inode * inode, struct file * filp) ...@@ -1536,7 +1537,7 @@ static int do_release(struct inode * inode, struct file * filp)
if (user_list == as) if (user_list == as)
user_list = as->next; user_list = as->next;
else { else {
struct apm_user * as1; struct apm_user *as1;
for (as1 = user_list; for (as1 = user_list;
(as1 != NULL) && (as1->next != as); (as1 != NULL) && (as1->next != as);
...@@ -1552,9 +1553,9 @@ static int do_release(struct inode * inode, struct file * filp) ...@@ -1552,9 +1553,9 @@ static int do_release(struct inode * inode, struct file * filp)
return 0; return 0;
} }
static int do_open(struct inode * inode, struct file * filp) static int do_open(struct inode *inode, struct file *filp)
{ {
struct apm_user * as; struct apm_user *as;
as = kmalloc(sizeof(*as), GFP_KERNEL); as = kmalloc(sizeof(*as), GFP_KERNEL);
if (as == NULL) { if (as == NULL) {
...@@ -1683,8 +1684,8 @@ static int apm(void *unused) ...@@ -1683,8 +1684,8 @@ static int apm(void *unused)
unsigned short cx; unsigned short cx;
unsigned short dx; unsigned short dx;
int error; int error;
char * power_stat; char *power_stat;
char * bat_stat; char *bat_stat;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* 2002/08/01 - WT /* 2002/08/01 - WT
...@@ -1743,23 +1744,41 @@ static int apm(void *unused) ...@@ -1743,23 +1744,41 @@ static int apm(void *unused)
} }
} }
if (debug && (num_online_cpus() == 1 || smp )) { if (debug && (num_online_cpus() == 1 || smp)) {
error = apm_get_power_status(&bx, &cx, &dx); error = apm_get_power_status(&bx, &cx, &dx);
if (error) if (error)
printk(KERN_INFO "apm: power status not available\n"); printk(KERN_INFO "apm: power status not available\n");
else { else {
switch ((bx >> 8) & 0xff) { switch ((bx >> 8) & 0xff) {
case 0: power_stat = "off line"; break; case 0:
case 1: power_stat = "on line"; break; power_stat = "off line";
case 2: power_stat = "on backup power"; break; break;
default: power_stat = "unknown"; break; case 1:
power_stat = "on line";
break;
case 2:
power_stat = "on backup power";
break;
default:
power_stat = "unknown";
break;
} }
switch (bx & 0xff) { switch (bx & 0xff) {
case 0: bat_stat = "high"; break; case 0:
case 1: bat_stat = "low"; break; bat_stat = "high";
case 2: bat_stat = "critical"; break; break;
case 3: bat_stat = "charging"; break; case 1:
default: bat_stat = "unknown"; break; bat_stat = "low";
break;
case 2:
bat_stat = "critical";
break;
case 3:
bat_stat = "charging";
break;
default:
bat_stat = "unknown";
break;
} }
printk(KERN_INFO printk(KERN_INFO
"apm: AC %s, battery status %s, battery life ", "apm: AC %s, battery status %s, battery life ",
...@@ -1827,8 +1846,7 @@ static int __init apm_setup(char *str) ...@@ -1827,8 +1846,7 @@ static int __init apm_setup(char *str)
if ((strncmp(str, "power-off", 9) == 0) || if ((strncmp(str, "power-off", 9) == 0) ||
(strncmp(str, "power_off", 9) == 0)) (strncmp(str, "power_off", 9) == 0))
power_off = !invert; power_off = !invert;
if (strncmp(str, "smp", 3) == 0) if (strncmp(str, "smp", 3) == 0) {
{
smp = !invert; smp = !invert;
idle_threshold = 100; idle_threshold = 100;
} }
...@@ -1880,7 +1898,8 @@ static int __init print_if_true(const struct dmi_system_id *d) ...@@ -1880,7 +1898,8 @@ static int __init print_if_true(const struct dmi_system_id *d)
*/ */
static int __init broken_ps2_resume(const struct dmi_system_id *d) static int __init broken_ps2_resume(const struct dmi_system_id *d)
{ {
printk(KERN_INFO "%s machine detected. Mousepad Resume Bug workaround hopefully not needed.\n", d->ident); printk(KERN_INFO "%s machine detected. Mousepad Resume Bug "
"workaround hopefully not needed.\n", d->ident);
return 0; return 0;
} }
...@@ -1889,7 +1908,8 @@ static int __init set_realmode_power_off(const struct dmi_system_id *d) ...@@ -1889,7 +1908,8 @@ static int __init set_realmode_power_off(const struct dmi_system_id *d)
{ {
if (apm_info.realmode_power_off == 0) { if (apm_info.realmode_power_off == 0) {
apm_info.realmode_power_off = 1; apm_info.realmode_power_off = 1;
printk(KERN_INFO "%s bios detected. Using realmode poweroff only.\n", d->ident); printk(KERN_INFO "%s bios detected. "
"Using realmode poweroff only.\n", d->ident);
} }
return 0; return 0;
} }
...@@ -1899,7 +1919,8 @@ static int __init set_apm_ints(const struct dmi_system_id *d) ...@@ -1899,7 +1919,8 @@ static int __init set_apm_ints(const struct dmi_system_id *d)
{ {
if (apm_info.allow_ints == 0) { if (apm_info.allow_ints == 0) {
apm_info.allow_ints = 1; apm_info.allow_ints = 1;
printk(KERN_INFO "%s machine detected. Enabling interrupts during APM calls.\n", d->ident); printk(KERN_INFO "%s machine detected. "
"Enabling interrupts during APM calls.\n", d->ident);
} }
return 0; return 0;
} }
...@@ -1909,7 +1930,8 @@ static int __init apm_is_horked(const struct dmi_system_id *d) ...@@ -1909,7 +1930,8 @@ static int __init apm_is_horked(const struct dmi_system_id *d)
{ {
if (apm_info.disabled == 0) { if (apm_info.disabled == 0) {
apm_info.disabled = 1; apm_info.disabled = 1;
printk(KERN_INFO "%s machine detected. Disabling APM.\n", d->ident); printk(KERN_INFO "%s machine detected. "
"Disabling APM.\n", d->ident);
} }
return 0; return 0;
} }
...@@ -1918,7 +1940,8 @@ static int __init apm_is_horked_d850md(const struct dmi_system_id *d) ...@@ -1918,7 +1940,8 @@ static int __init apm_is_horked_d850md(const struct dmi_system_id *d)
{ {
if (apm_info.disabled == 0) { if (apm_info.disabled == 0) {
apm_info.disabled = 1; apm_info.disabled = 1;
printk(KERN_INFO "%s machine detected. Disabling APM.\n", d->ident); printk(KERN_INFO "%s machine detected. "
"Disabling APM.\n", d->ident);
printk(KERN_INFO "This bug is fixed in bios P15 which is available for \n"); printk(KERN_INFO "This bug is fixed in bios P15 which is available for \n");
printk(KERN_INFO "download from support.intel.com \n"); printk(KERN_INFO "download from support.intel.com \n");
} }
...@@ -1930,7 +1953,8 @@ static int __init apm_likes_to_melt(const struct dmi_system_id *d) ...@@ -1930,7 +1953,8 @@ static int __init apm_likes_to_melt(const struct dmi_system_id *d)
{ {
if (apm_info.forbid_idle == 0) { if (apm_info.forbid_idle == 0) {
apm_info.forbid_idle = 1; apm_info.forbid_idle = 1;
printk(KERN_INFO "%s machine detected. Disabling APM idle calls.\n", d->ident); printk(KERN_INFO "%s machine detected. "
"Disabling APM idle calls.\n", d->ident);
} }
return 0; return 0;
} }
...@@ -1953,7 +1977,8 @@ static int __init apm_likes_to_melt(const struct dmi_system_id *d) ...@@ -1953,7 +1977,8 @@ static int __init apm_likes_to_melt(const struct dmi_system_id *d)
static int __init broken_apm_power(const struct dmi_system_id *d) static int __init broken_apm_power(const struct dmi_system_id *d)
{ {
apm_info.get_power_status_broken = 1; apm_info.get_power_status_broken = 1;
printk(KERN_WARNING "BIOS strings suggest APM bugs, disabling power status reporting.\n"); printk(KERN_WARNING "BIOS strings suggest APM bugs, "
"disabling power status reporting.\n");
return 0; return 0;
} }
...@@ -1964,7 +1989,8 @@ static int __init broken_apm_power(const struct dmi_system_id *d) ...@@ -1964,7 +1989,8 @@ static int __init broken_apm_power(const struct dmi_system_id *d)
static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d) static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
{ {
apm_info.get_power_status_swabinminutes = 1; apm_info.get_power_status_swabinminutes = 1;
printk(KERN_WARNING "BIOS strings suggest APM reports battery life in minutes and wrong byte order.\n"); printk(KERN_WARNING "BIOS strings suggest APM reports battery life "
"in minutes and wrong byte order.\n");
return 0; return 0;
} }
...@@ -1989,8 +2015,8 @@ static struct dmi_system_id __initdata apm_dmi_table[] = { ...@@ -1989,8 +2015,8 @@ static struct dmi_system_id __initdata apm_dmi_table[] = {
apm_is_horked, "Dell Inspiron 2500", apm_is_horked, "Dell Inspiron 2500",
{ DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 2500"), DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 2500"),
DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
DMI_MATCH(DMI_BIOS_VERSION,"A11"), }, DMI_MATCH(DMI_BIOS_VERSION, "A11"), },
}, },
{ /* Allow interrupts during suspend on Dell Inspiron laptops*/ { /* Allow interrupts during suspend on Dell Inspiron laptops*/
set_apm_ints, "Dell Inspiron", { set_apm_ints, "Dell Inspiron", {
...@@ -2013,15 +2039,15 @@ static struct dmi_system_id __initdata apm_dmi_table[] = { ...@@ -2013,15 +2039,15 @@ static struct dmi_system_id __initdata apm_dmi_table[] = {
apm_is_horked, "Dell Dimension 4100", apm_is_horked, "Dell Dimension 4100",
{ DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
DMI_MATCH(DMI_PRODUCT_NAME, "XPS-Z"), DMI_MATCH(DMI_PRODUCT_NAME, "XPS-Z"),
DMI_MATCH(DMI_BIOS_VENDOR,"Intel Corp."), DMI_MATCH(DMI_BIOS_VENDOR, "Intel Corp."),
DMI_MATCH(DMI_BIOS_VERSION,"A11"), }, DMI_MATCH(DMI_BIOS_VERSION, "A11"), },
}, },
{ /* Allow interrupts during suspend on Compaq Laptops*/ { /* Allow interrupts during suspend on Compaq Laptops*/
set_apm_ints, "Compaq 12XL125", set_apm_ints, "Compaq 12XL125",
{ DMI_MATCH(DMI_SYS_VENDOR, "Compaq"), { DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
DMI_MATCH(DMI_PRODUCT_NAME, "Compaq PC"), DMI_MATCH(DMI_PRODUCT_NAME, "Compaq PC"),
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
DMI_MATCH(DMI_BIOS_VERSION,"4.06"), }, DMI_MATCH(DMI_BIOS_VERSION, "4.06"), },
}, },
{ /* Allow interrupts during APM or the clock goes slow */ { /* Allow interrupts during APM or the clock goes slow */
set_apm_ints, "ASUSTeK", set_apm_ints, "ASUSTeK",
...@@ -2063,15 +2089,15 @@ static struct dmi_system_id __initdata apm_dmi_table[] = { ...@@ -2063,15 +2089,15 @@ static struct dmi_system_id __initdata apm_dmi_table[] = {
apm_is_horked, "Sharp PC-PJ/AX", apm_is_horked, "Sharp PC-PJ/AX",
{ DMI_MATCH(DMI_SYS_VENDOR, "SHARP"), { DMI_MATCH(DMI_SYS_VENDOR, "SHARP"),
DMI_MATCH(DMI_PRODUCT_NAME, "PC-PJ/AX"), DMI_MATCH(DMI_PRODUCT_NAME, "PC-PJ/AX"),
DMI_MATCH(DMI_BIOS_VENDOR,"SystemSoft"), DMI_MATCH(DMI_BIOS_VENDOR, "SystemSoft"),
DMI_MATCH(DMI_BIOS_VERSION,"Version R2.08"), }, DMI_MATCH(DMI_BIOS_VERSION, "Version R2.08"), },
}, },
{ /* APM crashes */ { /* APM crashes */
apm_is_horked, "Dell Inspiron 2500", apm_is_horked, "Dell Inspiron 2500",
{ DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 2500"), DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 2500"),
DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
DMI_MATCH(DMI_BIOS_VERSION,"A11"), }, DMI_MATCH(DMI_BIOS_VERSION, "A11"), },
}, },
{ /* APM idle hangs */ { /* APM idle hangs */
apm_likes_to_melt, "Jabil AMD", apm_likes_to_melt, "Jabil AMD",
...@@ -2311,7 +2337,7 @@ static int __init apm_init(void) ...@@ -2311,7 +2337,7 @@ static int __init apm_init(void)
} }
wake_up_process(kapmd_task); wake_up_process(kapmd_task);
if (num_online_cpus() > 1 && !smp ) { if (num_online_cpus() > 1 && !smp) {
printk(KERN_NOTICE printk(KERN_NOTICE
"apm: disabled - APM is not SMP safe (power off active).\n"); "apm: disabled - APM is not SMP safe (power off active).\n");
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment