aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2018-04-03 19:20:52 -0400
committerCorey Minyard <cminyard@mvista.com>2018-04-18 11:22:49 -0400
commitc81c5fc2128e3a596900859f10e294e30bc49b24 (patch)
tree4bc323737045a3865937284e9ed9f29f88659bee
parentf41382ae57f40b833c1080483770c59a791ac34f (diff)
ipmi:devintf: Clean up some coding style issues
Signed-off-by: Corey Minyard <cminyard@mvista.com>
-rw-r--r--drivers/char/ipmi/ipmi_devintf.c40
1 files changed, 18 insertions, 22 deletions
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 8ecfd47806fa..f862838e2c10 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -45,17 +45,17 @@ static void file_receive_handler(struct ipmi_recv_msg *msg,
45 int was_empty; 45 int was_empty;
46 unsigned long flags; 46 unsigned long flags;
47 47
48 spin_lock_irqsave(&(priv->recv_msg_lock), flags); 48 spin_lock_irqsave(&priv->recv_msg_lock, flags);
49 49
50 was_empty = list_empty(&(priv->recv_msgs)); 50 was_empty = list_empty(&priv->recv_msgs);
51 list_add_tail(&(msg->link), &(priv->recv_msgs)); 51 list_add_tail(&msg->link, &priv->recv_msgs);
52 52
53 if (was_empty) { 53 if (was_empty) {
54 wake_up_interruptible(&priv->wait); 54 wake_up_interruptible(&priv->wait);
55 kill_fasync(&priv->fasync_queue, SIGIO, POLL_IN); 55 kill_fasync(&priv->fasync_queue, SIGIO, POLL_IN);
56 } 56 }
57 57
58 spin_unlock_irqrestore(&(priv->recv_msg_lock), flags); 58 spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
59} 59}
60 60
61static __poll_t ipmi_poll(struct file *file, poll_table *wait) 61static __poll_t ipmi_poll(struct file *file, poll_table *wait)
@@ -68,7 +68,7 @@ static __poll_t ipmi_poll(struct file *file, poll_table *wait)
68 68
69 spin_lock_irqsave(&priv->recv_msg_lock, flags); 69 spin_lock_irqsave(&priv->recv_msg_lock, flags);
70 70
71 if (!list_empty(&(priv->recv_msgs))) 71 if (!list_empty(&priv->recv_msgs))
72 mask |= (EPOLLIN | EPOLLRDNORM); 72 mask |= (EPOLLIN | EPOLLRDNORM);
73 73
74 spin_unlock_irqrestore(&priv->recv_msg_lock, flags); 74 spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
@@ -110,7 +110,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
110 rv = ipmi_create_user(if_num, 110 rv = ipmi_create_user(if_num,
111 &ipmi_hndlrs, 111 &ipmi_hndlrs,
112 priv, 112 priv,
113 &(priv->user)); 113 &priv->user);
114 if (rv) { 114 if (rv) {
115 kfree(priv); 115 kfree(priv);
116 goto out; 116 goto out;
@@ -118,8 +118,8 @@ static int ipmi_open(struct inode *inode, struct file *file)
118 118
119 file->private_data = priv; 119 file->private_data = priv;
120 120
121 spin_lock_init(&(priv->recv_msg_lock)); 121 spin_lock_init(&priv->recv_msg_lock);
122 INIT_LIST_HEAD(&(priv->recv_msgs)); 122 INIT_LIST_HEAD(&priv->recv_msgs);
123 init_waitqueue_head(&priv->wait); 123 init_waitqueue_head(&priv->wait);
124 priv->fasync_queue = NULL; 124 priv->fasync_queue = NULL;
125 mutex_init(&priv->recv_mutex); 125 mutex_init(&priv->recv_mutex);
@@ -146,7 +146,6 @@ static int ipmi_release(struct inode *inode, struct file *file)
146 list_for_each_entry_safe(msg, next, &priv->recv_msgs, link) 146 list_for_each_entry_safe(msg, next, &priv->recv_msgs, link)
147 ipmi_free_recv_msg(msg); 147 ipmi_free_recv_msg(msg);
148 148
149
150 kfree(priv); 149 kfree(priv);
151 150
152 return 0; 151 return 0;
@@ -189,8 +188,7 @@ static int handle_send_req(ipmi_user_t user,
189 188
190 if (copy_from_user(msg.data, 189 if (copy_from_user(msg.data,
191 req->msg.data, 190 req->msg.data,
192 req->msg.data_len)) 191 req->msg.data_len)) {
193 {
194 rv = -EFAULT; 192 rv = -EFAULT;
195 goto out; 193 goto out;
196 } 194 }
@@ -233,25 +231,24 @@ static int handle_recv(struct ipmi_file_private *priv,
233 mutex_lock(&priv->recv_mutex); 231 mutex_lock(&priv->recv_mutex);
234 232
235 /* Grab the message off the list. */ 233 /* Grab the message off the list. */
236 spin_lock_irqsave(&(priv->recv_msg_lock), flags); 234 spin_lock_irqsave(&priv->recv_msg_lock, flags);
237 if (list_empty(&(priv->recv_msgs))) { 235 if (list_empty(&(priv->recv_msgs))) {
238 spin_unlock_irqrestore(&(priv->recv_msg_lock), flags); 236 spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
239 rv = -EAGAIN; 237 rv = -EAGAIN;
240 goto recv_err; 238 goto recv_err;
241 } 239 }
242 entry = priv->recv_msgs.next; 240 entry = priv->recv_msgs.next;
243 msg = list_entry(entry, struct ipmi_recv_msg, link); 241 msg = list_entry(entry, struct ipmi_recv_msg, link);
244 list_del(entry); 242 list_del(entry);
245 spin_unlock_irqrestore(&(priv->recv_msg_lock), flags); 243 spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
246 244
247 addr_len = ipmi_addr_length(msg->addr.addr_type); 245 addr_len = ipmi_addr_length(msg->addr.addr_type);
248 if (rsp->addr_len < addr_len) 246 if (rsp->addr_len < addr_len) {
249 {
250 rv = -EINVAL; 247 rv = -EINVAL;
251 goto recv_putback_on_err; 248 goto recv_putback_on_err;
252 } 249 }
253 250
254 if (copy_to_user(rsp->addr, &(msg->addr), addr_len)) { 251 if (copy_to_user(rsp->addr, &msg->addr, addr_len)) {
255 rv = -EFAULT; 252 rv = -EFAULT;
256 goto recv_putback_on_err; 253 goto recv_putback_on_err;
257 } 254 }
@@ -273,8 +270,7 @@ static int handle_recv(struct ipmi_file_private *priv,
273 270
274 if (copy_to_user(rsp->msg.data, 271 if (copy_to_user(rsp->msg.data,
275 msg->msg.data, 272 msg->msg.data,
276 msg->msg.data_len)) 273 msg->msg.data_len)) {
277 {
278 rv = -EFAULT; 274 rv = -EFAULT;
279 goto recv_putback_on_err; 275 goto recv_putback_on_err;
280 } 276 }
@@ -294,9 +290,9 @@ static int handle_recv(struct ipmi_file_private *priv,
294recv_putback_on_err: 290recv_putback_on_err:
295 /* If we got an error, put the message back onto 291 /* If we got an error, put the message back onto
296 the head of the queue. */ 292 the head of the queue. */
297 spin_lock_irqsave(&(priv->recv_msg_lock), flags); 293 spin_lock_irqsave(&priv->recv_msg_lock, flags);
298 list_add(entry, &(priv->recv_msgs)); 294 list_add(entry, &priv->recv_msgs);
299 spin_unlock_irqrestore(&(priv->recv_msg_lock), flags); 295 spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
300recv_err: 296recv_err:
301 mutex_unlock(&priv->recv_mutex); 297 mutex_unlock(&priv->recv_mutex);
302 return rv; 298 return rv;