aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-07-04 12:24:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-10 17:58:36 -0400
commit483136ea0e2b23f2aebf57e1a36a06dec4223a92 (patch)
tree3ff25b6cc48b892f9d0cae8318e682aa22d71a07
parentb45f3ccf80fb3e9e86bba2ad3640880d6fe85bfc (diff)
mei: mei_irq_thread_write_handler - line break fix
1. straight up lines that doesn't cross 80 characters 2. don't break strings Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mei/interrupt.c44
1 files changed, 16 insertions, 28 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index b4afc1211fd2..b428b3fe4092 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -1199,8 +1199,7 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
1199 dev_dbg(&dev->pdev->dev, "complete all waiting for write cb.\n"); 1199 dev_dbg(&dev->pdev->dev, "complete all waiting for write cb.\n");
1200 1200
1201 list = &dev->write_waiting_list; 1201 list = &dev->write_waiting_list;
1202 list_for_each_entry_safe(pos, next, 1202 list_for_each_entry_safe(pos, next, &list->mei_cb.cb_list, cb_list) {
1203 &list->mei_cb.cb_list, cb_list) {
1204 cl = (struct mei_cl *)pos->file_private; 1203 cl = (struct mei_cl *)pos->file_private;
1205 if (cl == NULL) 1204 if (cl == NULL)
1206 continue; 1205 continue;
@@ -1210,17 +1209,15 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
1210 if (MEI_WRITING == cl->writing_state && 1209 if (MEI_WRITING == cl->writing_state &&
1211 (pos->major_file_operations == MEI_WRITE) && 1210 (pos->major_file_operations == MEI_WRITE) &&
1212 (cl != &dev->iamthif_cl)) { 1211 (cl != &dev->iamthif_cl)) {
1213 dev_dbg(&dev->pdev->dev, 1212 dev_dbg(&dev->pdev->dev, "MEI WRITE COMPLETE\n");
1214 "MEI WRITE COMPLETE\n");
1215 cl->writing_state = MEI_WRITE_COMPLETE; 1213 cl->writing_state = MEI_WRITE_COMPLETE;
1216 list_add_tail(&pos->cb_list, 1214 list_add_tail(&pos->cb_list,
1217 &cmpl_list->mei_cb.cb_list); 1215 &cmpl_list->mei_cb.cb_list);
1218 } 1216 }
1219 if (cl == &dev->iamthif_cl) { 1217 if (cl == &dev->iamthif_cl) {
1220 dev_dbg(&dev->pdev->dev, "check iamthif flow control.\n"); 1218 dev_dbg(&dev->pdev->dev, "check iamthif flow control.\n");
1221 if (dev->iamthif_flow_control_pending) { 1219 if (dev->iamthif_flow_control_pending) {
1222 ret = _mei_irq_thread_iamthif_read( 1220 ret = _mei_irq_thread_iamthif_read(dev, slots);
1223 dev, slots);
1224 if (ret) 1221 if (ret)
1225 return ret; 1222 return ret;
1226 } 1223 }
@@ -1245,12 +1242,11 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
1245 } 1242 }
1246 if (dev->mei_state == MEI_ENABLED) { 1243 if (dev->mei_state == MEI_ENABLED) {
1247 if (dev->wd_pending && 1244 if (dev->wd_pending &&
1248 mei_flow_ctrl_creds(dev, &dev->wd_cl) > 0) { 1245 mei_flow_ctrl_creds(dev, &dev->wd_cl) > 0) {
1249 if (mei_wd_send(dev)) 1246 if (mei_wd_send(dev))
1250 dev_dbg(&dev->pdev->dev, "wd send failed.\n"); 1247 dev_dbg(&dev->pdev->dev, "wd send failed.\n");
1251 else 1248 else if (mei_flow_ctrl_reduce(dev, &dev->wd_cl))
1252 if (mei_flow_ctrl_reduce(dev, &dev->wd_cl)) 1249 return -ENODEV;
1253 return -ENODEV;
1254 1250
1255 dev->wd_pending = false; 1251 dev->wd_pending = false;
1256 1252
@@ -1305,7 +1301,7 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
1305 /* complete write list CB */ 1301 /* complete write list CB */
1306 dev_dbg(&dev->pdev->dev, "complete write list cb.\n"); 1302 dev_dbg(&dev->pdev->dev, "complete write list cb.\n");
1307 list_for_each_entry_safe(pos, next, 1303 list_for_each_entry_safe(pos, next,
1308 &dev->write_list.mei_cb.cb_list, cb_list) { 1304 &dev->write_list.mei_cb.cb_list, cb_list) {
1309 cl = (struct mei_cl *)pos->file_private; 1305 cl = (struct mei_cl *)pos->file_private;
1310 if (cl == NULL) 1306 if (cl == NULL)
1311 continue; 1307 continue;
@@ -1313,15 +1309,12 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
1313 if (cl != &dev->iamthif_cl) { 1309 if (cl != &dev->iamthif_cl) {
1314 if (mei_flow_ctrl_creds(dev, cl) <= 0) { 1310 if (mei_flow_ctrl_creds(dev, cl) <= 0) {
1315 dev_dbg(&dev->pdev->dev, 1311 dev_dbg(&dev->pdev->dev,
1316 "No flow control" 1312 "No flow control credentials for client %d, not sending.\n",
1317 " credentials for client" 1313 cl->host_client_id);
1318 " %d, not sending.\n",
1319 cl->host_client_id);
1320 continue; 1314 continue;
1321 } 1315 }
1322 ret = _mei_irq_thread_cmpl(dev, slots, 1316 ret = _mei_irq_thread_cmpl(dev, slots, pos,
1323 pos, 1317 cl, cmpl_list);
1324 cl, cmpl_list);
1325 if (ret) 1318 if (ret)
1326 return ret; 1319 return ret;
1327 1320
@@ -1330,17 +1323,12 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
1330 dev_dbg(&dev->pdev->dev, "complete amthi write cb.\n"); 1323 dev_dbg(&dev->pdev->dev, "complete amthi write cb.\n");
1331 if (mei_flow_ctrl_creds(dev, cl) <= 0) { 1324 if (mei_flow_ctrl_creds(dev, cl) <= 0) {
1332 dev_dbg(&dev->pdev->dev, 1325 dev_dbg(&dev->pdev->dev,
1333 "No flow control" 1326 "No flow control credentials for amthi client %d.\n",
1334 " credentials for amthi" 1327 cl->host_client_id);
1335 " client %d.\n",
1336 cl->host_client_id);
1337 continue; 1328 continue;
1338 } 1329 }
1339 ret = _mei_irq_thread_cmpl_iamthif(dev, 1330 ret = _mei_irq_thread_cmpl_iamthif(dev, slots, pos,
1340 slots, 1331 cl, cmpl_list);
1341 pos,
1342 cl,
1343 cmpl_list);
1344 if (ret) 1332 if (ret)
1345 return ret; 1333 return ret;
1346 1334