Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 22:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipmi: boolify some things

Browse Source 
Convert some ints to bools.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Corey Minyard 2014-04-14 09:46:56 -05:00 committed by Linus Torvalds
parent 89986496de
commit 7aefac26fc
3 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/char/ipmi/ipmi_msghandler.c
View File

@ -94,8 +94,8 @@ static struct proc_dir_entry *proc_ipmi_root;
struct ipmi_user { struct ipmi_user {
struct list_head link; struct list_head link;
/* Set to "0" when the user is destroyed. */ /* Set to false when the user is destroyed. */
int valid; bool valid;
struct kref refcount; struct kref refcount;
@ -413,7 +413,7 @@ struct ipmi_smi {
/* For handling of maintenance mode. */ /* For handling of maintenance mode. */
int maintenance_mode; int maintenance_mode;
int maintenance_mode_enable; bool maintenance_mode_enable;
int auto_maintenance_timeout; int auto_maintenance_timeout;
spinlock_t maintenance_mode_lock; /* Used in a timer... */ spinlock_t maintenance_mode_lock; /* Used in a timer... */
@ -980,7 +980,7 @@ int ipmi_create_user(unsigned int if_num,
*/ */
mutex_unlock(&ipmi_interfaces_mutex); mutex_unlock(&ipmi_interfaces_mutex);
new_user->valid = 1; new_user->valid = true;
spin_lock_irqsave(&intf->seq_lock, flags); spin_lock_irqsave(&intf->seq_lock, flags);
list_add_rcu(&new_user->link, &intf->users); list_add_rcu(&new_user->link, &intf->users);
spin_unlock_irqrestore(&intf->seq_lock, flags); spin_unlock_irqrestore(&intf->seq_lock, flags);
@ -1042,7 +1042,7 @@ int ipmi_destroy_user(ipmi_user_t user)
struct cmd_rcvr *rcvr; struct cmd_rcvr *rcvr;
struct cmd_rcvr *rcvrs = NULL; struct cmd_rcvr *rcvrs = NULL;
user->valid = 0; user->valid = false;
if (user->handler->ipmi_watchdog_pretimeout) if (user->handler->ipmi_watchdog_pretimeout)
atomic_dec(&intf->event_waiters); atomic_dec(&intf->event_waiters);
@ -1184,25 +1184,23 @@ int ipmi_set_maintenance_mode(ipmi_user_t user, int mode)
if (intf->maintenance_mode != mode) { if (intf->maintenance_mode != mode) {
switch (mode) { switch (mode) {
case IPMI_MAINTENANCE_MODE_AUTO: case IPMI_MAINTENANCE_MODE_AUTO:
intf->maintenance_mode = mode;
intf->maintenance_mode_enable intf->maintenance_mode_enable
= (intf->auto_maintenance_timeout > 0); = (intf->auto_maintenance_timeout > 0);
break; break;
case IPMI_MAINTENANCE_MODE_OFF: case IPMI_MAINTENANCE_MODE_OFF:
intf->maintenance_mode = mode; intf->maintenance_mode_enable = false;
intf->maintenance_mode_enable = 0;
break; break;
case IPMI_MAINTENANCE_MODE_ON: case IPMI_MAINTENANCE_MODE_ON:
intf->maintenance_mode = mode; intf->maintenance_mode_enable = true;
intf->maintenance_mode_enable = 1;
break; break;
default: default:
rv = -EINVAL; rv = -EINVAL;
goto out_unlock; goto out_unlock;
} }
intf->maintenance_mode = mode;
maintenance_mode_update(intf); maintenance_mode_update(intf);
} }
@ -1578,7 +1576,7 @@ static int i_ipmi_request(ipmi_user_t user,
= IPMI_MAINTENANCE_MODE_TIMEOUT; = IPMI_MAINTENANCE_MODE_TIMEOUT;
if (!intf->maintenance_mode if (!intf->maintenance_mode
&& !intf->maintenance_mode_enable) { && !intf->maintenance_mode_enable) {
intf->maintenance_mode_enable = 1; intf->maintenance_mode_enable = true;
maintenance_mode_update(intf); maintenance_mode_update(intf);
} }
spin_unlock_irqrestore(&intf->maintenance_mode_lock, spin_unlock_irqrestore(&intf->maintenance_mode_lock,
@ -4129,7 +4127,7 @@ static unsigned int ipmi_timeout_handler(ipmi_smi_t intf, long timeout_period)
-= timeout_period; -= timeout_period;
if (!intf->maintenance_mode if (!intf->maintenance_mode
&& (intf->auto_maintenance_timeout <= 0)) { && (intf->auto_maintenance_timeout <= 0)) {
intf->maintenance_mode_enable = 0; intf->maintenance_mode_enable = false;
maintenance_mode_update(intf); maintenance_mode_update(intf);
} }
} }

50
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -217,7 +217,7 @@ struct smi_info {
unsigned char msg_flags; unsigned char msg_flags;
/* Does the BMC have an event buffer? */ /* Does the BMC have an event buffer? */
char has_event_buffer; bool has_event_buffer;
/* /*
* If set to true, this will request events the next time the * If set to true, this will request events the next time the
@ -230,7 +230,7 @@ struct smi_info {
* call. Generally used after a panic to make sure stuff goes * call. Generally used after a panic to make sure stuff goes
* out. * out.
*/ */
int run_to_completion; bool run_to_completion;
/* The I/O port of an SI interface. */ /* The I/O port of an SI interface. */
int port; int port;
@ -266,7 +266,7 @@ struct smi_info {
* memory. Once that situation clears up, it will re-enable * memory. Once that situation clears up, it will re-enable
* interrupts. * interrupts.
*/ */
int interrupt_disabled; bool interrupt_disabled;
/* From the get device id response... */ /* From the get device id response... */
struct ipmi_device_id device_id; struct ipmi_device_id device_id;
@ -279,7 +279,7 @@ struct smi_info {
* True if we allocated the device, false if it came from * True if we allocated the device, false if it came from
* someplace else (like PCI). * someplace else (like PCI).
*/ */
int dev_registered; bool dev_registered;
/* Slave address, could be reported from DMI. */ /* Slave address, could be reported from DMI. */
unsigned char slave_addr; unsigned char slave_addr;
@ -303,19 +303,19 @@ struct smi_info {
static int force_kipmid[SI_MAX_PARMS]; static int force_kipmid[SI_MAX_PARMS];
static int num_force_kipmid; static int num_force_kipmid;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int pci_registered; static bool pci_registered;
#endif #endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static int pnp_registered; static bool pnp_registered;
#endif #endif
#ifdef CONFIG_PARISC #ifdef CONFIG_PARISC
static int parisc_registered; static bool parisc_registered;
#endif #endif
static unsigned int kipmid_max_busy_us[SI_MAX_PARMS]; static unsigned int kipmid_max_busy_us[SI_MAX_PARMS];
static int num_max_busy_us; static int num_max_busy_us;
static int unload_when_empty = 1; static bool unload_when_empty = true;
static int add_smi(struct smi_info *smi); static int add_smi(struct smi_info *smi);
static int try_smi_init(struct smi_info *smi); static int try_smi_init(struct smi_info *smi);
@ -457,7 +457,7 @@ static inline void disable_si_irq(struct smi_info *smi_info)
{ {
if ((smi_info->irq) && (!smi_info->interrupt_disabled)) { if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
start_disable_irq(smi_info); start_disable_irq(smi_info);
smi_info->interrupt_disabled = 1; smi_info->interrupt_disabled = true;
if (!atomic_read(&smi_info->stop_operation)) if (!atomic_read(&smi_info->stop_operation))
smi_mod_timer(smi_info, jiffies + SI_TIMEOUT_JIFFIES); smi_mod_timer(smi_info, jiffies + SI_TIMEOUT_JIFFIES);
} }
@ -467,7 +467,7 @@ static inline void enable_si_irq(struct smi_info *smi_info)
{ {
if ((smi_info->irq) && (smi_info->interrupt_disabled)) { if ((smi_info->irq) && (smi_info->interrupt_disabled)) {
start_enable_irq(smi_info); start_enable_irq(smi_info);
smi_info->interrupt_disabled = 0; smi_info->interrupt_disabled = false;
} }
} }
@ -712,7 +712,7 @@ static void handle_transaction_done(struct smi_info *smi_info)
dev_warn(smi_info->dev, dev_warn(smi_info->dev,
"Maybe ok, but ipmi might run very slowly.\n"); "Maybe ok, but ipmi might run very slowly.\n");
} else } else
smi_info->interrupt_disabled = 0; smi_info->interrupt_disabled = false;
smi_info->si_state = SI_NORMAL; smi_info->si_state = SI_NORMAL;
break; break;
} }
@ -935,7 +935,7 @@ static void sender(void *send_info,
spin_unlock_irqrestore(&smi_info->si_lock, flags); spin_unlock_irqrestore(&smi_info->si_lock, flags);
} }
static void set_run_to_completion(void *send_info, int i_run_to_completion) static void set_run_to_completion(void *send_info, bool i_run_to_completion)
{ {
struct smi_info *smi_info = send_info; struct smi_info *smi_info = send_info;
enum si_sm_result result; enum si_sm_result result;
@ -1050,7 +1050,7 @@ static void poll(void *send_info)
{ {
struct smi_info *smi_info = send_info; struct smi_info *smi_info = send_info;
unsigned long flags = 0; unsigned long flags = 0;
int run_to_completion = smi_info->run_to_completion; bool run_to_completion = smi_info->run_to_completion;
/* /*
* Make sure there is some delay in the poll loop so we can * Make sure there is some delay in the poll loop so we can
@ -1075,7 +1075,7 @@ static void request_events(void *send_info)
atomic_set(&smi_info->req_events, 1); atomic_set(&smi_info->req_events, 1);
} }
static void set_need_watch(void *send_info, int enable) static void set_need_watch(void *send_info, bool enable)
{ {
struct smi_info *smi_info = send_info; struct smi_info *smi_info = send_info;
unsigned long flags; unsigned long flags;
@ -1223,7 +1223,7 @@ static int get_smi_info(void *send_info, struct ipmi_smi_info *data)
return 0; return 0;
} }
static void set_maintenance_mode(void *send_info, int enable) static void set_maintenance_mode(void *send_info, bool enable)
{ {
struct smi_info *smi_info = send_info; struct smi_info *smi_info = send_info;
@ -1364,7 +1364,7 @@ module_param_array(force_kipmid, int, &num_force_kipmid, 0);
MODULE_PARM_DESC(force_kipmid, "Force the kipmi daemon to be enabled (1) or" MODULE_PARM_DESC(force_kipmid, "Force the kipmi daemon to be enabled (1) or"
" disabled(0). Normally the IPMI driver auto-detects" " disabled(0). Normally the IPMI driver auto-detects"
" this, but the value may be overridden by this parm."); " this, but the value may be overridden by this parm.");
module_param(unload_when_empty, int, 0); module_param(unload_when_empty, bool, 0);
MODULE_PARM_DESC(unload_when_empty, "Unload the module if no interfaces are" MODULE_PARM_DESC(unload_when_empty, "Unload the module if no interfaces are"
" specified or found, default is 1. Setting to 0" " specified or found, default is 1. Setting to 0"
" is useful for hot add of devices using hotmod."); " is useful for hot add of devices using hotmod.");
@ -3372,11 +3372,11 @@ static int try_smi_init(struct smi_info *new_smi)
INIT_LIST_HEAD(&(new_smi->hp_xmit_msgs)); INIT_LIST_HEAD(&(new_smi->hp_xmit_msgs));
new_smi->curr_msg = NULL; new_smi->curr_msg = NULL;
atomic_set(&new_smi->req_events, 0); atomic_set(&new_smi->req_events, 0);
new_smi->run_to_completion = 0; new_smi->run_to_completion = false;
for (i = 0; i < SI_NUM_STATS; i++) for (i = 0; i < SI_NUM_STATS; i++)
atomic_set(&new_smi->stats[i], 0); atomic_set(&new_smi->stats[i], 0);
new_smi->interrupt_disabled = 1; new_smi->interrupt_disabled = true;
atomic_set(&new_smi->stop_operation, 0); atomic_set(&new_smi->stop_operation, 0);
atomic_set(&new_smi->need_watch, 0); atomic_set(&new_smi->need_watch, 0);
new_smi->intf_num = smi_num; new_smi->intf_num = smi_num;
@ -3384,7 +3384,7 @@ static int try_smi_init(struct smi_info *new_smi)
rv = try_enable_event_buffer(new_smi); rv = try_enable_event_buffer(new_smi);
if (rv == 0) if (rv == 0)
new_smi->has_event_buffer = 1; new_smi->has_event_buffer = true;
/* /*
* Start clearing the flags before we enable interrupts or the * Start clearing the flags before we enable interrupts or the
@ -3418,7 +3418,7 @@ static int try_smi_init(struct smi_info *new_smi)
rv); rv);
goto out_err; goto out_err;
} }
new_smi->dev_registered = 1; new_smi->dev_registered = true;
} }
rv = ipmi_register_smi(&handlers, rv = ipmi_register_smi(&handlers,
@ -3467,7 +3467,7 @@ static int try_smi_init(struct smi_info *new_smi)
wait_for_timer_and_thread(new_smi); wait_for_timer_and_thread(new_smi);
out_err: out_err:
new_smi->interrupt_disabled = 1; new_smi->interrupt_disabled = true;
if (new_smi->intf) { if (new_smi->intf) {
ipmi_unregister_smi(new_smi->intf); ipmi_unregister_smi(new_smi->intf);
@ -3503,7 +3503,7 @@ static int try_smi_init(struct smi_info *new_smi)
if (new_smi->dev_registered) { if (new_smi->dev_registered) {
platform_device_unregister(new_smi->pdev); platform_device_unregister(new_smi->pdev);
new_smi->dev_registered = 0; new_smi->dev_registered = false;
} }
return rv; return rv;
@ -3558,14 +3558,14 @@ static int init_ipmi_si(void)
printk(KERN_ERR PFX "Unable to register " printk(KERN_ERR PFX "Unable to register "
"PCI driver: %d\n", rv); "PCI driver: %d\n", rv);
else else
pci_registered = 1; pci_registered = true;
} }
#endif #endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
if (si_tryacpi) { if (si_tryacpi) {
pnp_register_driver(&ipmi_pnp_driver); pnp_register_driver(&ipmi_pnp_driver);
pnp_registered = 1; pnp_registered = true;
} }
#endif #endif
@ -3581,7 +3581,7 @@ static int init_ipmi_si(void)
#ifdef CONFIG_PARISC #ifdef CONFIG_PARISC
register_parisc_driver(&ipmi_parisc_driver); register_parisc_driver(&ipmi_parisc_driver);
parisc_registered = 1; parisc_registered = true;
/* poking PC IO addresses will crash machine, don't do it */ /* poking PC IO addresses will crash machine, don't do it */
si_trydefaults = 0; si_trydefaults = 0;
#endif #endif

6
include/linux/ipmi_smi.h
View File

@ -114,14 +114,14 @@ struct ipmi_smi_handlers {
pretimeouts, or not. Used by the SMI to know if it should pretimeouts, or not. Used by the SMI to know if it should
watch for these. This may be NULL if the SMI does not watch for these. This may be NULL if the SMI does not
implement it. */ implement it. */
void (*set_need_watch)(void *send_info, int enable); void (*set_need_watch)(void *send_info, bool enable);
/* Called when the interface should go into "run to /* Called when the interface should go into "run to
completion" mode. If this call sets the value to true, the completion" mode. If this call sets the value to true, the
interface should make sure that all messages are flushed interface should make sure that all messages are flushed
out and that none are pending, and any new requests are run out and that none are pending, and any new requests are run
to completion immediately. */ to completion immediately. */
void (*set_run_to_completion)(void *send_info, int run_to_completion); void (*set_run_to_completion)(void *send_info, bool run_to_completion);
/* Called to poll for work to do. This is so upper layers can /* Called to poll for work to do. This is so upper layers can
poll for operations during things like crash dumps. */ poll for operations during things like crash dumps. */
@ -132,7 +132,7 @@ struct ipmi_smi_handlers {
setting. The message handler does the mode handling. Note setting. The message handler does the mode handling. Note
that this is called from interrupt context, so it cannot that this is called from interrupt context, so it cannot
block. */ block. */
void (*set_maintenance_mode)(void *send_info, int enable); void (*set_maintenance_mode)(void *send_info, bool enable);
/* Tell the handler that we are using it/not using it. The /* Tell the handler that we are using it/not using it. The
message handler get the modules that this handler belongs message handler get the modules that this handler belongs