IPMI: tidy up various things
PATCH 2/3 IPMI: tidy up various things
Tidy up various coding standard things, mostly removing the space after !, but also break some long lines and fix a few other spacing inconsistencies. Also fixes some bad error reporting when deleting an IPMI user.
Signed-off-by Corey Minyard <[email protected]>
drivers/char/ipmi/ipmi_kcs_sm.c +4 -4
@@ -227,7 +227,7 @@ static inline int check_ibf(struct si_smstatic inline int check_obf (struct si_sm_data *kcs,unsigned char status,long time) { -if (!GET_STATUS_OBF (status)) { +if (!GET_STATUS_OBF (status)) { kcs->obf_timeout -= time;if (kcs->obf_timeout <0 ) {start_error_recovery (kcs,"OBF not ready in time" );
@@ -407,7 +407,7 @@ static enum si_sm_result kcs_event(struc }if (state ==KCS_READ_STATE ) { -if (!check_obf (kcs, status, time)) +if (!check_obf (kcs, status, time))return SI_SM_CALL_WITH_DELAY ;read_next_byte (kcs); }else {
@@ -447,7 +447,7 @@ static enum si_sm_result kcs_event(struc "Not in read state for error2");break ; } -if (!check_obf (kcs, status, time)) +if (!check_obf (kcs, status, time))return SI_SM_CALL_WITH_DELAY ;clear_obf (kcs, status);
@@ -462,7 +462,7 @@ static enum si_sm_result kcs_event(strucbreak ; } -if (!check_obf (kcs, status, time)) +if (!check_obf (kcs, status, time))return SI_SM_CALL_WITH_DELAY ;clear_obf (kcs, status);
drivers/char/ipmi/ipmi_msghandler.c +25 -23
169 lines not on this page · raw message
drivers/char/ipmi/ipmi_poweroff.c +1 -1
@@ -346,7 +346,7 @@ static int ipmi_dell_chassis_detect (ipm {const char ipmi_version_major = ipmi_version &0xF ;const char ipmi_version_minor = (ipmi_version >>4 ) &0xF ; -const char mfr[3 ]=DELL_IANA_MFR_ID ; +const char mfr[3 ] =DELL_IANA_MFR_ID ;if (!memcmp (mfr, &mfg_id,sizeof (mfr)) && ipmi_version_major <=1 && ipmi_version_minor <5 )
drivers/char/ipmi/ipmi_si_intf.c +1 -1
@@ -802,7 +802,7 @@ static int ipmi_thread(void *data)set_user_nice (current,19 );while (!kthread_should_stop ()) {spin_lock_irqsave (&(smi_info->si_lock), flags); - smi_result=smi_event_handler (smi_info,0 ); + smi_result =smi_event_handler (smi_info,0 );spin_unlock_irqrestore (&(smi_info->si_lock), flags);if (smi_result ==SI_SM_CALL_WITHOUT_DELAY ) {/* do nothing */
drivers/char/ipmi/ipmi_watchdog.c +4 -4
@@ -589,7 +589,7 @@ static void panic_halt_ipmi_heartbeat(vo 1); } -static struct watchdog_info ident= +static struct watchdog_info ident = { .options =0 ,/* WDIOF_SETTIMEOUT, */ .firmware_version =1 ,
@@ -790,13 +790,13 @@ static int ipmi_fasync(int fd, struct fistatic int ipmi_close (struct inode *ino,struct file *filep) { -if (iminor (ino)==WATCHDOG_MINOR ) - { +if (iminor (ino) ==WATCHDOG_MINOR ) {if (expect_close ==42 ) { ipmi_watchdog_state =WDOG_TIMEOUT_NONE ;ipmi_set_timeout (IPMI_SET_TIMEOUT_NO_HB ); }else { - printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n"); + printk(KERN_CRIT PFX + "Unexpected close, not stopping watchdog!\n");ipmi_heartbeat (); }clear_bit (0 , &ipmi_wdog_open);