Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ced2c60fb5024a5cf5c33cb573b3d6a66d738f36

Authored by Ashutosh Dixit
Committed by Greg Kroah-Hartman
1 parent 4aa79961a5
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

misc: mic: cleanups for "--strict" checkpatch. 

These changes were mostly authored by Joe Perches <joe@perches.com>
@ https://lkml.org/lkml/2013/9/5/602

Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
Signed-off-by: Harshavardhan R Kharche <harshavardhan.r.kharche@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 12 changed files with 158 additions and 167 deletions Side-by-side Diff

Documentation/mic/mpssd/mpssd.c
Diff comments   View file @ ced2c60
... ... @@ -246,7 +246,7 @@
246 246 if (*dev)
247 247 strncpy(ifr.ifr_name, dev, IFNAMSIZ);
248 248  
249   - err = ioctl(fd, TUNSETIFF, (void *) &ifr);
  249 + err = ioctl(fd, TUNSETIFF, (void *)&ifr);
250 250 if (err < 0) {
251 251 mpsslog("%s %s %d TUNSETIFF failed %s\n",
252 252 mic->name, __func__, __LINE__, strerror(errno));
... ... @@ -363,7 +363,7 @@
363 363 {
364 364 if (copy->out_len != sum_iovec_len(copy)) {
365 365 mpsslog("%s %s %d BUG copy->out_len 0x%x len 0x%x\n",
366   - mic->name, __func__, __LINE__,
  366 + mic->name, __func__, __LINE__,
367 367 copy->out_len, sum_iovec_len(copy));
368 368 assert(copy->out_len == sum_iovec_len(copy));
369 369 }
... ... @@ -372,7 +372,7 @@
372 372 /* Display an iovec */
373 373 static void
374 374 disp_iovec(struct mic_info *mic, struct mic_copy_desc *copy,
375   - const char *s, int line)
  375 + const char *s, int line)
376 376 {
377 377 int i;
378 378  
... ... @@ -401,7 +401,7 @@
401 401 /* Central API which triggers the copies */
402 402 static int
403 403 mic_virtio_copy(struct mic_info *mic, int fd,
404   - struct mic_vring *vr, struct mic_copy_desc *copy)
  404 + struct mic_vring *vr, struct mic_copy_desc *copy)
405 405 {
406 406 int ret;
407 407  
... ... @@ -440,7 +440,7 @@
440 440 vr0->info = vr0->va +
441 441 vring_size(MIC_VRING_ENTRIES, MIC_VIRTIO_RING_ALIGN);
442 442 vring_init(&vr0->vr,
443   - MIC_VRING_ENTRIES, vr0->va, MIC_VIRTIO_RING_ALIGN);
  443 + MIC_VRING_ENTRIES, vr0->va, MIC_VIRTIO_RING_ALIGN);
444 444 mpsslog("%s %s vr0 %p vr0->info %p vr_size 0x%x vring 0x%x ",
445 445 __func__, mic->name, vr0->va, vr0->info, vr_size,
446 446 vring_size(MIC_VRING_ENTRIES, MIC_VIRTIO_RING_ALIGN));
... ... @@ -453,7 +453,7 @@
453 453 vr1->info = vr1->va + vring_size(MIC_VRING_ENTRIES,
454 454 MIC_VIRTIO_RING_ALIGN);
455 455 vring_init(&vr1->vr,
456   - MIC_VRING_ENTRIES, vr1->va, MIC_VIRTIO_RING_ALIGN);
  456 + MIC_VRING_ENTRIES, vr1->va, MIC_VIRTIO_RING_ALIGN);
457 457 mpsslog("%s %s vr1 %p vr1->info %p vr_size 0x%x vring 0x%x ",
458 458 __func__, mic->name, vr1->va, vr1->info, vr_size,
459 459 vring_size(MIC_VRING_ENTRIES, MIC_VIRTIO_RING_ALIGN));
... ... @@ -551,7 +551,7 @@
551 551 net_poll[NET_FD_TUN].events = POLLIN;
552 552  
553 553 if (MAP_FAILED == init_vr(mic, mic->mic_net.virtio_net_fd,
554   - VIRTIO_ID_NET, &tx_vr, &rx_vr,
  554 + VIRTIO_ID_NET, &tx_vr, &rx_vr,
555 555 virtnet_dev_page.dd.num_vq)) {
556 556 mpsslog("%s init_vr failed %s\n",
557 557 mic->name, strerror(errno));
... ... @@ -576,7 +576,7 @@
576 576 }
577 577 if (!(desc->status & VIRTIO_CONFIG_S_DRIVER_OK))
578 578 wait_for_card_driver(mic, mic->mic_net.virtio_net_fd,
579   - VIRTIO_ID_NET);
  579 + VIRTIO_ID_NET);
580 580 /*
581 581 * Check if there is data to be read from TUN and write to
582 582 * virtio net fd if there is.
... ... @@ -587,7 +587,7 @@
587 587 copy.iov, copy.iovcnt);
588 588 if (len > 0) {
589 589 struct virtio_net_hdr *hdr
590   - = (struct virtio_net_hdr *) vnet_hdr[0];
  590 + = (struct virtio_net_hdr *)vnet_hdr[0];
591 591  
592 592 /* Disable checksums on the card since we are on
593 593 a reliable PCIe link */
... ... @@ -606,7 +606,7 @@
606 606 #endif
607 607 spin_for_descriptors(mic, &tx_vr);
608 608 txrx_prepare(VIRTIO_ID_NET, 1, &tx_vr, &copy,
609   - len);
  609 + len);
610 610  
611 611 err = mic_virtio_copy(mic,
612 612 mic->mic_net.virtio_net_fd, &tx_vr,
... ... @@ -644,7 +644,7 @@
644 644 le16toh(rx_vr.vr.avail->idx)) {
645 645 copy.iov = iov1;
646 646 txrx_prepare(VIRTIO_ID_NET, 0, &rx_vr, &copy,
647   - MAX_NET_PKT_SIZE
  647 + MAX_NET_PKT_SIZE
648 648 + sizeof(struct virtio_net_hdr));
649 649  
650 650 err = mic_virtio_copy(mic,
... ... @@ -669,7 +669,7 @@
669 669 verify_out_len(mic, &copy);
670 670 #ifdef DEBUG
671 671 disp_iovec(mic, copy, __func__,
672   - __LINE__);
  672 + __LINE__);
673 673 mpsslog("%s %s %d ",
674 674 mic->name, __func__, __LINE__);
675 675 mpsslog("read from net 0x%lx\n",
... ... @@ -686,7 +686,7 @@
686 686 } else {
687 687 #ifdef DEBUG
688 688 disp_iovec(mic, &copy, __func__,
689   - __LINE__);
  689 + __LINE__);
690 690 mpsslog("%s %s %d ",
691 691 mic->name, __func__,
692 692 __LINE__);
693 693  
... ... @@ -750,13 +750,13 @@
750 750 err = grantpt(pty_fd);
751 751 if (err < 0) {
752 752 mpsslog("can't grant access: %s %s\n",
753   - pts_name, strerror(errno));
  753 + pts_name, strerror(errno));
754 754 goto _close_pty;
755 755 }
756 756 err = unlockpt(pty_fd);
757 757 if (err < 0) {
758 758 mpsslog("can't unlock a pseudoterminal: %s %s\n",
759   - pts_name, strerror(errno));
  759 + pts_name, strerror(errno));
760 760 goto _close_pty;
761 761 }
762 762 console_poll[MONITOR_FD].fd = pty_fd;
... ... @@ -766,7 +766,7 @@
766 766 console_poll[VIRTIO_CONSOLE_FD].events = POLLIN;
767 767  
768 768 if (MAP_FAILED == init_vr(mic, mic->mic_console.virtio_console_fd,
769   - VIRTIO_ID_CONSOLE, &tx_vr, &rx_vr,
  769 + VIRTIO_ID_CONSOLE, &tx_vr, &rx_vr,
770 770 virtcons_dev_page.dd.num_vq)) {
771 771 mpsslog("%s init_vr failed %s\n",
772 772 mic->name, strerror(errno));
... ... @@ -787,7 +787,7 @@
787 787 }
788 788 if (!(desc->status & VIRTIO_CONFIG_S_DRIVER_OK))
789 789 wait_for_card_driver(mic,
790   - mic->mic_console.virtio_console_fd,
  790 + mic->mic_console.virtio_console_fd,
791 791 VIRTIO_ID_CONSOLE);
792 792  
793 793 if (console_poll[MONITOR_FD].revents & POLLIN) {
... ... @@ -802,7 +802,7 @@
802 802 #endif
803 803 spin_for_descriptors(mic, &tx_vr);
804 804 txrx_prepare(VIRTIO_ID_CONSOLE, 1, &tx_vr,
805   - &copy, len);
  805 + &copy, len);
806 806  
807 807 err = mic_virtio_copy(mic,
808 808 mic->mic_console.virtio_console_fd,
... ... @@ -837,7 +837,7 @@
837 837 le16toh(rx_vr.vr.avail->idx)) {
838 838 copy.iov = iov1;
839 839 txrx_prepare(VIRTIO_ID_CONSOLE, 0, &rx_vr,
840   - &copy, PAGE_SIZE);
  840 + &copy, PAGE_SIZE);
841 841  
842 842 err = mic_virtio_copy(mic,
843 843 mic->mic_console.virtio_console_fd,
... ... @@ -848,7 +848,7 @@
848 848 verify_out_len(mic, &copy);
849 849 #ifdef DEBUG
850 850 disp_iovec(mic, copy, __func__,
851   - __LINE__);
  851 + __LINE__);
852 852 mpsslog("%s %s %d ",
853 853 mic->name, __func__, __LINE__);
854 854 mpsslog("read from net 0x%lx\n",
... ... @@ -865,7 +865,7 @@
865 865 } else {
866 866 #ifdef DEBUG
867 867 disp_iovec(mic, copy, __func__,
868   - __LINE__);
  868 + __LINE__);
869 869 mpsslog("%s %s %d ",
870 870 mic->name, __func__,
871 871 __LINE__);
... ... @@ -1033,7 +1033,8 @@
1033 1033 }
1034 1034 add_virtio_device(mic, &virtblk_dev_page.dd);
1035 1035 if (MAP_FAILED == init_vr(mic, mic->mic_virtblk.virtio_block_fd,
1036   - VIRTIO_ID_BLOCK, vring, NULL, virtblk_dev_page.dd.num_vq)) {
  1036 + VIRTIO_ID_BLOCK, vring, NULL,
  1037 + virtblk_dev_page.dd.num_vq)) {
1037 1038 mpsslog("%s init_vr failed %s\n",
1038 1039 mic->name, strerror(errno));
1039 1040 return false;
... ... @@ -1060,7 +1061,7 @@
1060 1061 {
1061 1062 if (le32toh(desc->len) != sizeof(struct virtio_blk_outhdr)) {
1062 1063 mpsslog("%s() %d: length is not sizeof(virtio_blk_outhd)\n",
1063   - __func__, __LINE__);
  1064 + __func__, __LINE__);
1064 1065 return -EIO;
1065 1066 }
1066 1067 if (!(le16toh(desc->flags) & VRING_DESC_F_NEXT)) {
... ... @@ -1132,7 +1133,7 @@
1132 1133 static void *
1133 1134 virtio_block(void *arg)
1134 1135 {
1135   - struct mic_info *mic = (struct mic_info *) arg;
  1136 + struct mic_info *mic = (struct mic_info *)arg;
1136 1137 int ret;
1137 1138 struct pollfd block_poll;
1138 1139 struct mic_vring vring;
... ... @@ -1219,8 +1220,8 @@
1219 1220 status = 0;
1220 1221 fos = mic->mic_virtblk.backend_addr +
1221 1222 (hdr.sector * SECTOR_SIZE);
1222   - buffer_desc_idx = desc_idx =
1223   - next_desc(desc);
  1223 + buffer_desc_idx = next_desc(desc);
  1224 + desc_idx = buffer_desc_idx;
1224 1225 for (desc = &vring.vr.desc[buffer_desc_idx];
1225 1226 desc->flags & VRING_DESC_F_NEXT;
1226 1227 desc_idx = next_desc(desc),
... ... @@ -1255,7 +1256,7 @@
1255 1256 iovec,
1256 1257 piov - iovec);
1257 1258 if (ret < 0 &&
1258   - status != 0)
  1259 + status != 0)
1259 1260 status = ret;
1260 1261 }
1261 1262 /* write status and update used pointer */
... ... @@ -1391,7 +1392,7 @@
1391 1392 char value[4096];
1392 1393  
1393 1394 snprintf(pathname, PATH_MAX - 1, "%s/%s/%s",
1394   - MICSYSFSDIR, mic->name, "state");
  1395 + MICSYSFSDIR, mic->name, "state");
1395 1396  
1396 1397 fd = open(pathname, O_RDONLY);
1397 1398 if (fd < 0) {
1398 1399  
1399 1400  
1400 1401  
... ... @@ -1560,22 +1561,22 @@
1560 1561 virtio_console, mic);
1561 1562 if (err)
1562 1563 mpsslog("%s virtcons pthread_create failed %s\n",
1563   - mic->name, strerror(err));
  1564 + mic->name, strerror(err));
1564 1565 err = pthread_create(&mic->mic_net.net_thread, NULL,
1565 1566 virtio_net, mic);
1566 1567 if (err)
1567 1568 mpsslog("%s virtnet pthread_create failed %s\n",
1568   - mic->name, strerror(err));
  1569 + mic->name, strerror(err));
1569 1570 err = pthread_create(&mic->mic_virtblk.block_thread, NULL,
1570 1571 virtio_block, mic);
1571 1572 if (err)
1572 1573 mpsslog("%s virtblk pthread_create failed %s\n",
1573   - mic->name, strerror(err));
  1574 + mic->name, strerror(err));
1574 1575 sigemptyset(&act.sa_mask);
1575 1576 err = sigaction(SIGUSR1, &act, NULL);
1576 1577 if (err)
1577 1578 mpsslog("%s sigaction SIGUSR1 failed %s\n",
1578   - mic->name, strerror(errno));
  1579 + mic->name, strerror(errno));
1579 1580 while (1)
1580 1581 sleep(60);
1581 1582 case -1:
Documentation/mic/mpssd/sysfs.c
Diff comments   View file @ ced2c60
... ... @@ -35,7 +35,7 @@
35 35 snprintf(filename, PATH_MAX, "%s/%s", MICSYSFSDIR, entry);
36 36 else
37 37 snprintf(filename, PATH_MAX,
38   - "%s/%s/%s", MICSYSFSDIR, dir, entry);
  38 + "%s/%s/%s", MICSYSFSDIR, dir, entry);
39 39  
40 40 fd = open(filename, O_RDONLY);
41 41 if (fd < 0) {
... ... @@ -75,7 +75,7 @@
75 75 snprintf(filename, PATH_MAX, "%s/%s", MICSYSFSDIR, entry);
76 76 else
77 77 snprintf(filename, PATH_MAX, "%s/%s/%s",
78   - MICSYSFSDIR, dir, entry);
  78 + MICSYSFSDIR, dir, entry);
79 79  
80 80 oldvalue = readsysfs(dir, entry);
81 81  
drivers/misc/mic/card/mic_device.c
Diff comments   View file @ ced2c60
... ... @@ -167,7 +167,6 @@
167 167 return (struct mic_irq *)cookie;
168 168 err:
169 169 return ERR_PTR(rc);
170   -
171 170 }
172 171  
173 172 /**
drivers/misc/mic/card/mic_virtio.c
Diff comments   View file @ ced2c60
... ... @@ -103,7 +103,7 @@
103 103 for (i = 0; i < bits; i++) {
104 104 if (test_bit(i, vdev->features))
105 105 iowrite8(ioread8(&out_features[i / 8]) | (1 << (i % 8)),
106   - &out_features[i / 8]);
  106 + &out_features[i / 8]);
107 107 }
108 108 }
109 109  
110 110  
... ... @@ -197,10 +197,9 @@
197 197 static void mic_del_vq(struct virtqueue *vq, int n)
198 198 {
199 199 struct mic_vdev *mvdev = to_micvdev(vq->vdev);
200   - struct vring *vr = (struct vring *) (vq + 1);
  200 + struct vring *vr = (struct vring *)(vq + 1);
201 201  
202   - free_pages((unsigned long) vr->used,
203   - get_order(mvdev->used_size[n]));
  202 + free_pages((unsigned long) vr->used, get_order(mvdev->used_size[n]));
204 203 vring_del_virtqueue(vq);
205 204 mic_card_unmap(mvdev->mdev, mvdev->vr[n]);
206 205 mvdev->vr[n] = NULL;
... ... @@ -274,8 +273,8 @@
274 273 /* Allocate and reassign used ring now */
275 274 mvdev->used_size[index] = PAGE_ALIGN(sizeof(__u16) * 3 +
276 275 sizeof(struct vring_used_elem) * config.num);
277   - used = (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
278   - get_order(mvdev->used_size[index]));
  276 + used = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
  277 + get_order(mvdev->used_size[index]));
279 278 if (!used) {
280 279 err = -ENOMEM;
281 280 dev_err(mic_dev(mvdev), "%s %d err %d\n",
... ... @@ -291,7 +290,7 @@
291 290 * vring_new_virtqueue() would ensure that
292 291 * (&vq->vring == (struct vring *) (&vq->vq + 1));
293 292 */
294   - vr = (struct vring *) (vq + 1);
  293 + vr = (struct vring *)(vq + 1);
295 294 vr->used = used;
296 295  
297 296 vq->priv = mvdev;
... ... @@ -544,7 +543,7 @@
544 543 if (dev) {
545 544 if (remove)
546 545 iowrite8(MIC_VIRTIO_PARAM_DEV_REMOVE,
547   - &dc->config_change);
  546 + &dc->config_change);
548 547 put_device(dev);
549 548 mic_handle_config_change(d, i, mdrv);
550 549 ret = mic_remove_device(d, i, mdrv);
... ... @@ -559,7 +558,7 @@
559 558  
560 559 /* new device */
561 560 dev_dbg(mdrv->dev, "%s %d Adding new virtio device %p\n",
562   - __func__, __LINE__, d);
  561 + __func__, __LINE__, d);
563 562 if (!remove)
564 563 mic_add_device(d, i, mdrv);
565 564 }
drivers/misc/mic/card/mic_x100.c
Diff comments   View file @ ced2c60
... ... @@ -66,8 +66,8 @@
66 66 /* Ensure that the interrupt is ordered w.r.t previous stores. */
67 67 wmb();
68 68 mic_mmio_write(mw, MIC_X100_SBOX_SDBIC0_DBREQ_BIT,
69   - MIC_X100_SBOX_BASE_ADDRESS +
70   - (MIC_X100_SBOX_SDBIC0 + (4 * doorbell)));
  69 + MIC_X100_SBOX_BASE_ADDRESS +
  70 + (MIC_X100_SBOX_SDBIC0 + (4 * doorbell)));
71 71 }
72 72  
73 73 /**
drivers/misc/mic/host/mic_debugfs.c
Diff comments   View file @ ced2c60
... ... @@ -103,7 +103,7 @@
103 103 unsigned long flags;
104 104  
105 105 seq_printf(s, "MIC %-2d |%-10s| %-14s %-10s\n",
106   - mdev->id, "SMPT entry", "SW DMA addr", "RefCount");
  106 + mdev->id, "SMPT entry", "SW DMA addr", "RefCount");
107 107 seq_puts(s, "====================================================\n");
108 108  
109 109 if (mdev->smpt) {
... ... @@ -111,8 +111,8 @@
111 111 spin_lock_irqsave(&smpt_info->smpt_lock, flags);
112 112 for (i = 0; i < smpt_info->info.num_reg; i++) {
113 113 seq_printf(s, "%9s|%-10d| %-#14llx %-10lld\n",
114   - " ", i, smpt_info->entry[i].dma_addr,
115   - smpt_info->entry[i].ref_count);
  114 + " ", i, smpt_info->entry[i].dma_addr,
  115 + smpt_info->entry[i].ref_count);
116 116 }
117 117 spin_unlock_irqrestore(&smpt_info->smpt_lock, flags);
118 118 }
119 119  
120 120  
121 121  
122 122  
123 123  
... ... @@ -203,17 +203,17 @@
203 203 int i, j;
204 204  
205 205 seq_printf(s, "Bootparam: magic 0x%x\n",
206   - bootparam->magic);
  206 + bootparam->magic);
207 207 seq_printf(s, "Bootparam: h2c_shutdown_db %d\n",
208   - bootparam->h2c_shutdown_db);
  208 + bootparam->h2c_shutdown_db);
209 209 seq_printf(s, "Bootparam: h2c_config_db %d\n",
210   - bootparam->h2c_config_db);
  210 + bootparam->h2c_config_db);
211 211 seq_printf(s, "Bootparam: c2h_shutdown_db %d\n",
212   - bootparam->c2h_shutdown_db);
  212 + bootparam->c2h_shutdown_db);
213 213 seq_printf(s, "Bootparam: shutdown_status %d\n",
214   - bootparam->shutdown_status);
  214 + bootparam->shutdown_status);
215 215 seq_printf(s, "Bootparam: shutdown_card %d\n",
216   - bootparam->shutdown_card);
  216 + bootparam->shutdown_card);
217 217  
218 218 for (i = sizeof(*bootparam); i < MIC_DP_SIZE;
219 219 i += mic_total_desc_size(d)) {
220 220  
... ... @@ -239,10 +239,10 @@
239 239 seq_printf(s, "address 0x%llx ", vqconfig->address);
240 240 seq_printf(s, "num %d ", vqconfig->num);
241 241 seq_printf(s, "used address 0x%llx\n",
242   - vqconfig->used_address);
  242 + vqconfig->used_address);
243 243 }
244 244  
245   - features = (__u32 *) mic_vq_features(d);
  245 + features = (__u32 *)mic_vq_features(d);
246 246 seq_printf(s, "Features: Host 0x%x ", features[0]);
247 247 seq_printf(s, "Guest 0x%x\n", features[1]);
248 248  
... ... @@ -256,7 +256,7 @@
256 256 seq_printf(s, "Guest Ack %d ", dc->guest_ack);
257 257 seq_printf(s, "Host ack %d\n", dc->host_ack);
258 258 seq_printf(s, "Used address updated %d ",
259   - dc->used_address_updated);
  259 + dc->used_address_updated);
260 260 seq_printf(s, "Vdev 0x%llx\n", dc->vdev);
261 261 seq_printf(s, "c2h doorbell %d ", dc->c2h_vdev_db);
262 262 seq_printf(s, "h2c doorbell %d\n", dc->h2c_vdev_db);
... ... @@ -294,10 +294,10 @@
294 294 list_for_each_safe(pos, tmp, &mdev->vdev_list) {
295 295 mvdev = list_entry(pos, struct mic_vdev, list);
296 296 seq_printf(s, "VDEV type %d state %s in %ld out %ld\n",
297   - mvdev->virtio_id,
298   - mic_vdevup(mvdev) ? "UP" : "DOWN",
299   - mvdev->in_bytes,
300   - mvdev->out_bytes);
  297 + mvdev->virtio_id,
  298 + mic_vdevup(mvdev) ? "UP" : "DOWN",
  299 + mvdev->in_bytes,
  300 + mvdev->out_bytes);
301 301 for (i = 0; i < MIC_MAX_VRINGS; i++) {
302 302 struct vring_desc *desc;
303 303 struct vring_avail *avail;
304 304  
305 305  
306 306  
307 307  
308 308  
309 309  
310 310  
311 311  
312 312  
313 313  
314 314  
... ... @@ -309,38 +309,38 @@
309 309 continue;
310 310 desc = vrh->vring.desc;
311 311 seq_printf(s, "vring i %d avail_idx %d",
312   - i, mvr->vring.info->avail_idx & (num - 1));
  312 + i, mvr->vring.info->avail_idx & (num - 1));
313 313 seq_printf(s, " vring i %d avail_idx %d\n",
314   - i, mvr->vring.info->avail_idx);
  314 + i, mvr->vring.info->avail_idx);
315 315 seq_printf(s, "vrh i %d weak_barriers %d",
316   - i, vrh->weak_barriers);
  316 + i, vrh->weak_barriers);
317 317 seq_printf(s, " last_avail_idx %d last_used_idx %d",
318   - vrh->last_avail_idx, vrh->last_used_idx);
  318 + vrh->last_avail_idx, vrh->last_used_idx);
319 319 seq_printf(s, " completed %d\n", vrh->completed);
320 320 for (j = 0; j < num; j++) {
321 321 seq_printf(s, "desc[%d] addr 0x%llx len %d",
322   - j, desc->addr, desc->len);
  322 + j, desc->addr, desc->len);
323 323 seq_printf(s, " flags 0x%x next %d\n",
324   - desc->flags,
325   - desc->next);
  324 + desc->flags, desc->next);
326 325 desc++;
327 326 }
328 327 avail = vrh->vring.avail;
329 328 seq_printf(s, "avail flags 0x%x idx %d\n",
330   - avail->flags, avail->idx & (num - 1));
  329 + avail->flags, avail->idx & (num - 1));
331 330 seq_printf(s, "avail flags 0x%x idx %d\n",
332   - avail->flags, avail->idx);
  331 + avail->flags, avail->idx);
333 332 for (j = 0; j < num; j++)
334 333 seq_printf(s, "avail ring[%d] %d\n",
335   - j, avail->ring[j]);
  334 + j, avail->ring[j]);
336 335 used = vrh->vring.used;
337 336 seq_printf(s, "used flags 0x%x idx %d\n",
338   - used->flags, used->idx & (num - 1));
  337 + used->flags, used->idx & (num - 1));
339 338 seq_printf(s, "used flags 0x%x idx %d\n",
340   - used->flags, used->idx);
  339 + used->flags, used->idx);
341 340 for (j = 0; j < num; j++)
342 341 seq_printf(s, "used ring[%d] id %d len %d\n",
343   - j, used->ring[j].id, used->ring[j].len);
  342 + j, used->ring[j].id,
  343 + used->ring[j].len);
344 344 }
345 345 }
346 346 mutex_unlock(&mdev->mic_mutex);
... ... @@ -389,7 +389,7 @@
389 389 reg = mdev->intr_ops->read_msi_to_src_map(mdev, entry);
390 390  
391 391 seq_printf(s, "%s %-10d %s %-10d MXAR[%d]: %08X\n",
392   - "IRQ:", vector, "Entry:", entry, i, reg);
  392 + "IRQ:", vector, "Entry:", entry, i, reg);
393 393  
394 394 seq_printf(s, "%-10s", "offset:");
395 395 for (j = (MIC_NUM_OFFSETS - 1); j >= 0; j--)
... ... @@ -400,8 +400,8 @@
400 400 seq_printf(s, "%-10s", "count:");
401 401 for (j = (MIC_NUM_OFFSETS - 1); j >= 0; j--)
402 402 seq_printf(s, "%4d ",
403   - (mdev->irq_info.mic_msi_map[i] & BIT(j)) ?
404   - 1 : 0);
  403 + (mdev->irq_info.mic_msi_map[i] &
  404 + BIT(j)) ? 1 : 0);
405 405 seq_puts(s, "\n\n");
406 406 }
407 407 } else {
... ... @@ -409,7 +409,6 @@
409 409 }
410 410  
411 411 return 0;
412   -
413 412 }
414 413  
415 414 static int mic_msi_irq_info_debug_open(struct inode *inode, struct file *file)
416 415  
417 416  
418 417  
419 418  
420 419  
421 420  
... ... @@ -443,26 +442,23 @@
443 442 if (!mdev->dbg_dir)
444 443 return;
445 444  
446   - debugfs_create_file("log_buf", 0444, mdev->dbg_dir,
447   - mdev, &log_buf_ops);
  445 + debugfs_create_file("log_buf", 0444, mdev->dbg_dir, mdev, &log_buf_ops);
448 446  
449   - debugfs_create_file("smpt", 0444, mdev->dbg_dir,
450   - mdev, &smpt_file_ops);
  447 + debugfs_create_file("smpt", 0444, mdev->dbg_dir, mdev, &smpt_file_ops);
451 448  
452   - debugfs_create_file("soft_reset", 0444, mdev->dbg_dir,
453   - mdev, &soft_reset_ops);
  449 + debugfs_create_file("soft_reset", 0444, mdev->dbg_dir, mdev,
  450 + &soft_reset_ops);
454 451  
455   - debugfs_create_file("post_code", 0444, mdev->dbg_dir,
456   - mdev, &post_code_ops);
  452 + debugfs_create_file("post_code", 0444, mdev->dbg_dir, mdev,
  453 + &post_code_ops);
457 454  
458   - debugfs_create_file("dp", 0444, mdev->dbg_dir,
459   - mdev, &dp_ops);
  455 + debugfs_create_file("dp", 0444, mdev->dbg_dir, mdev, &dp_ops);
460 456  
461   - debugfs_create_file("vdev_info", 0444, mdev->dbg_dir,
462   - mdev, &vdev_info_ops);
  457 + debugfs_create_file("vdev_info", 0444, mdev->dbg_dir, mdev,
  458 + &vdev_info_ops);
463 459  
464   - debugfs_create_file("msi_irq_info", 0444, mdev->dbg_dir,
465   - mdev, &msi_irq_info_ops);
  460 + debugfs_create_file("msi_irq_info", 0444, mdev->dbg_dir, mdev,
  461 + &msi_irq_info_ops);
466 462 }
467 463  
468 464 /**
drivers/misc/mic/host/mic_fops.c
Diff comments   View file @ ced2c60
... ... @@ -140,9 +140,9 @@
140 140  
141 141 poll_wait(f, &mvdev->waitq, wait);
142 142  
143   - if (mic_vdev_inited(mvdev))
  143 + if (mic_vdev_inited(mvdev)) {
144 144 mask = POLLERR;
145   - else if (mvdev->poll_wake) {
  145 + } else if (mvdev->poll_wake) {
146 146 mvdev->poll_wake = 0;
147 147 mask = POLLIN | POLLOUT;
148 148 }
... ... @@ -152,7 +152,7 @@
152 152  
153 153 static inline int
154 154 mic_query_offset(struct mic_vdev *mvdev, unsigned long offset,
155   - unsigned long *size, unsigned long *pa)
  155 + unsigned long *size, unsigned long *pa)
156 156 {
157 157 struct mic_device *mdev = mvdev->mdev;
158 158 unsigned long start = MIC_DP_SIZE;
drivers/misc/mic/host/mic_intr.c
Diff comments   View file @ ced2c60
... ... @@ -71,8 +71,8 @@
71 71  
72 72 /* Return the interrupt offset from the index. Index is 0 based. */
73 73 static u16 mic_map_src_to_offset(struct mic_device *mdev,
74   - int intr_src, enum mic_intr_type type) {
75   -
  74 + int intr_src, enum mic_intr_type type)
  75 +{
76 76 if (type >= MIC_NUM_INTR_TYPES)
77 77 return MIC_NUM_OFFSETS;
78 78 if (intr_src >= mdev->intr_info->intr_len[type])
... ... @@ -112,7 +112,7 @@
112 112 struct mic_intr_cb *intr_cb;
113 113 unsigned long flags;
114 114 int rc;
115   - intr_cb = kmalloc(sizeof(struct mic_intr_cb), GFP_KERNEL);
  115 + intr_cb = kmalloc(sizeof(*intr_cb), GFP_KERNEL);
116 116  
117 117 if (!intr_cb)
118 118 return ERR_PTR(-ENOMEM);
... ... @@ -159,7 +159,7 @@
159 159 if (intr_cb->cb_id == idx) {
160 160 list_del(pos);
161 161 ida_simple_remove(&mdev->irq_info.cb_ida,
162   - intr_cb->cb_id);
  162 + intr_cb->cb_id);
163 163 kfree(intr_cb);
164 164 spin_unlock_irqrestore(
165 165 &mdev->irq_info.mic_intr_lock, flags);
166 166  
... ... @@ -182,9 +182,10 @@
182 182 static int mic_setup_msix(struct mic_device *mdev, struct pci_dev *pdev)
183 183 {
184 184 int rc, i;
  185 + int entry_size = sizeof(*mdev->irq_info.msix_entries);
185 186  
186   - mdev->irq_info.msix_entries = kmalloc(sizeof(struct msix_entry) *
187   - MIC_MIN_MSIX, GFP_KERNEL);
  187 + mdev->irq_info.msix_entries = kmalloc_array(MIC_MIN_MSIX,
  188 + entry_size, GFP_KERNEL);
188 189 if (!mdev->irq_info.msix_entries) {
189 190 rc = -ENOMEM;
190 191 goto err_nomem1;
... ... @@ -231,8 +232,9 @@
231 232 {
232 233 int i;
233 234  
234   - mdev->irq_info.cb_list = kmalloc(sizeof(struct list_head) *
235   - MIC_NUM_OFFSETS, GFP_KERNEL);
  235 + mdev->irq_info.cb_list = kmalloc_array(MIC_NUM_OFFSETS,
  236 + sizeof(*mdev->irq_info.cb_list),
  237 + GFP_KERNEL);
236 238 if (!mdev->irq_info.cb_list)
237 239 return -ENOMEM;
238 240  
... ... @@ -261,7 +263,7 @@
261 263  
262 264 if (list_empty(&mdev->irq_info.cb_list[i])) {
263 265 spin_unlock_irqrestore(&mdev->irq_info.mic_intr_lock,
264   - flags);
  266 + flags);
265 267 break;
266 268 }
267 269  
... ... @@ -269,7 +271,7 @@
269 271 intr_cb = list_entry(pos, struct mic_intr_cb, list);
270 272 list_del(pos);
271 273 ida_simple_remove(&mdev->irq_info.cb_ida,
272   - intr_cb->cb_id);
  274 + intr_cb->cb_id);
273 275 kfree(intr_cb);
274 276 }
275 277 spin_unlock_irqrestore(&mdev->irq_info.mic_intr_lock, flags);
... ... @@ -427,8 +429,8 @@
427 429 offset = mic_map_src_to_offset(mdev, intr_src, type);
428 430 if (offset >= MIC_NUM_OFFSETS) {
429 431 dev_err(mdev->sdev->parent,
430   - "Error mapping index %d to a valid source id.\n",
431   - intr_src);
  432 + "Error mapping index %d to a valid source id.\n",
  433 + intr_src);
432 434 rc = -EINVAL;
433 435 goto err;
434 436 }
... ... @@ -437,7 +439,7 @@
437 439 msix = mic_get_available_vector(mdev);
438 440 if (!msix) {
439 441 dev_err(mdev->sdev->parent,
440   - "No MSIx vectors available for use.\n");
  442 + "No MSIx vectors available for use.\n");
441 443 rc = -ENOSPC;
442 444 goto err;
443 445 }
... ... @@ -460,7 +462,7 @@
460 462 offset, func, data);
461 463 if (IS_ERR(intr_cb)) {
462 464 dev_err(mdev->sdev->parent,
463   - "No available callback entries for use\n");
  465 + "No available callback entries for use\n");
464 466 rc = PTR_ERR(intr_cb);
465 467 goto err;
466 468 }
... ... @@ -506,7 +508,7 @@
506 508 if (mdev->irq_info.num_vectors > 1) {
507 509 if (entry >= mdev->irq_info.num_vectors) {
508 510 dev_warn(mdev->sdev->parent,
509   - "entry %d should be < num_irq %d\n",
  511 + "entry %d should be < num_irq %d\n",
510 512 entry, mdev->irq_info.num_vectors);
511 513 return;
512 514 }
... ... @@ -581,7 +583,7 @@
581 583 for (i = 0; i < mdev->irq_info.num_vectors; i++) {
582 584 if (mdev->irq_info.mic_msi_map[i])
583 585 dev_warn(&pdev->dev, "irq %d may still be in use.\n",
584   - mdev->irq_info.msix_entries[i].vector);
  586 + mdev->irq_info.msix_entries[i].vector);
585 587 }
586 588 kfree(mdev->irq_info.mic_msi_map);
587 589 kfree(mdev->irq_info.msix_entries);
drivers/misc/mic/host/mic_smpt.c
Diff comments   View file @ ced2c60
... ... @@ -84,7 +84,7 @@
84 84 for (i = spt; i < spt + entries; i++,
85 85 addr += smpt_info->info.page_size) {
86 86 if (!smpt_info->entry[i].ref_count &&
87   - (smpt_info->entry[i].dma_addr != addr)) {
  87 + (smpt_info->entry[i].dma_addr != addr)) {
88 88 mdev->smpt_ops->set(mdev, addr, i);
89 89 smpt_info->entry[i].dma_addr = addr;
90 90 }
... ... @@ -183,7 +183,7 @@
183 183  
184 184 if (!mic_is_system_addr(mdev, mic_addr)) {
185 185 dev_err(mdev->sdev->parent,
186   - "mic_addr is invalid. mic_addr = 0x%llx\n", mic_addr);
  186 + "mic_addr is invalid. mic_addr = 0x%llx\n", mic_addr);
187 187 return -EINVAL;
188 188 }
189 189 spt = mic_sys_addr_to_smpt(mdev, mic_addr);
... ... @@ -286,7 +286,7 @@
286 286 smpt_info->entry[i].ref_count -= ref[i - spt];
287 287 if (smpt_info->entry[i].ref_count < 0)
288 288 dev_warn(mdev->sdev->parent,
289   - "ref count for entry %d is negative\n", i);
  289 + "ref count for entry %d is negative\n", i);
290 290 }
291 291 spin_unlock_irqrestore(&smpt_info->smpt_lock, flags);
292 292 kfree(ref);
... ... @@ -320,7 +320,7 @@
320 320 "mic_map failed dma_addr 0x%llx size 0x%lx\n",
321 321 dma_addr, size);
322 322 pci_unmap_single(pdev, dma_addr,
323   - size, PCI_DMA_BIDIRECTIONAL);
  323 + size, PCI_DMA_BIDIRECTIONAL);
324 324 }
325 325 }
326 326 return mic_addr;
... ... @@ -366,8 +366,8 @@
366 366  
367 367 smpt_info = mdev->smpt;
368 368 mdev->smpt_ops->init(mdev);
369   - smpt_info->entry = kmalloc(sizeof(struct mic_smpt)
370   - * smpt_info->info.num_reg, GFP_KERNEL);
  369 + smpt_info->entry = kmalloc_array(smpt_info->info.num_reg,
  370 + sizeof(*smpt_info->entry), GFP_KERNEL);
371 371 if (!smpt_info->entry) {
372 372 err = -ENOMEM;
373 373 goto free_smpt;
... ... @@ -412,7 +412,7 @@
412 412 smpt_info->entry[i].ref_count);
413 413 if (smpt_info->entry[i].ref_count)
414 414 dev_warn(mdev->sdev->parent,
415   - "ref count for entry %d is not zero\n", i);
  415 + "ref count for entry %d is not zero\n", i);
416 416 }
417 417 kfree(smpt_info->entry);
418 418 kfree(smpt_info);
drivers/misc/mic/host/mic_sysfs.c
Diff comments   View file @ ced2c60
... ... @@ -130,7 +130,7 @@
130 130  
131 131 static ssize_t
132 132 state_store(struct device *dev, struct device_attribute *attr,
133   - const char *buf, size_t count)
  133 + const char *buf, size_t count)
134 134 {
135 135 int rc = 0;
136 136 struct mic_device *mdev = dev_get_drvdata(dev->parent);
... ... @@ -163,7 +163,7 @@
163 163 static DEVICE_ATTR_RW(state);
164 164  
165 165 static ssize_t shutdown_status_show(struct device *dev,
166   - struct device_attribute *attr, char *buf)
  166 + struct device_attribute *attr, char *buf)
167 167 {
168 168 struct mic_device *mdev = dev_get_drvdata(dev->parent);
169 169  
... ... @@ -193,7 +193,7 @@
193 193  
194 194 static ssize_t
195 195 cmdline_store(struct device *dev, struct device_attribute *attr,
196   - const char *buf, size_t count)
  196 + const char *buf, size_t count)
197 197 {
198 198 struct mic_device *mdev = dev_get_drvdata(dev->parent);
199 199  
... ... @@ -239,7 +239,7 @@
239 239  
240 240 static ssize_t
241 241 firmware_store(struct device *dev, struct device_attribute *attr,
242   - const char *buf, size_t count)
  242 + const char *buf, size_t count)
243 243 {
244 244 struct mic_device *mdev = dev_get_drvdata(dev->parent);
245 245  
... ... @@ -284,7 +284,7 @@
284 284  
285 285 static ssize_t
286 286 ramdisk_store(struct device *dev, struct device_attribute *attr,
287   - const char *buf, size_t count)
  287 + const char *buf, size_t count)
288 288 {
289 289 struct mic_device *mdev = dev_get_drvdata(dev->parent);
290 290  
... ... @@ -330,7 +330,7 @@
330 330  
331 331 static ssize_t
332 332 bootmode_store(struct device *dev, struct device_attribute *attr,
333   - const char *buf, size_t count)
  333 + const char *buf, size_t count)
334 334 {
335 335 struct mic_device *mdev = dev_get_drvdata(dev->parent);
336 336  
... ... @@ -363,7 +363,7 @@
363 363  
364 364 static ssize_t
365 365 log_buf_addr_show(struct device *dev, struct device_attribute *attr,
366   - char *buf)
  366 + char *buf)
367 367 {
368 368 struct mic_device *mdev = dev_get_drvdata(dev->parent);
369 369  
... ... @@ -375,7 +375,7 @@
375 375  
376 376 static ssize_t
377 377 log_buf_addr_store(struct device *dev, struct device_attribute *attr,
378   - const char *buf, size_t count)
  378 + const char *buf, size_t count)
379 379 {
380 380 struct mic_device *mdev = dev_get_drvdata(dev->parent);
381 381 int ret;
... ... @@ -397,7 +397,7 @@
397 397  
398 398 static ssize_t
399 399 log_buf_len_show(struct device *dev, struct device_attribute *attr,
400   - char *buf)
  400 + char *buf)
401 401 {
402 402 struct mic_device *mdev = dev_get_drvdata(dev->parent);
403 403  
... ... @@ -409,7 +409,7 @@
409 409  
410 410 static ssize_t
411 411 log_buf_len_store(struct device *dev, struct device_attribute *attr,
412   - const char *buf, size_t count)
  412 + const char *buf, size_t count)
413 413 {
414 414 struct mic_device *mdev = dev_get_drvdata(dev->parent);
415 415 int ret;
drivers/misc/mic/host/mic_virtio.c
Diff comments   View file @ ced2c60
... ... @@ -195,7 +195,7 @@
195 195 MIC_VRINGH_READ, &out_len);
196 196 if (ret) {
197 197 dev_err(mic_dev(mvdev), "%s %d err %d\n",
198   - __func__, __LINE__, ret);
  198 + __func__, __LINE__, ret);
199 199 break;
200 200 }
201 201 len -= out_len;
... ... @@ -206,7 +206,7 @@
206 206 !MIC_VRINGH_READ, &out_len);
207 207 if (ret) {
208 208 dev_err(mic_dev(mvdev), "%s %d err %d\n",
209   - __func__, __LINE__, ret);
  209 + __func__, __LINE__, ret);
210 210 break;
211 211 }
212 212 len -= out_len;
... ... @@ -225,8 +225,7 @@
225 225 * Update the used ring if a descriptor was available and some data was
226 226 * copied in/out and the user asked for a used ring update.
227 227 */
228   - if (*head != USHRT_MAX && copy->out_len &&
229   - copy->update_used) {
  228 + if (*head != USHRT_MAX && copy->out_len && copy->update_used) {
230 229 u32 total = 0;
231 230  
232 231 /* Determine the total data consumed */
... ... @@ -367,7 +366,6 @@
367 366  
368 367 static irqreturn_t mic_virtio_intr_handler(int irq, void *data)
369 368 {
370   -
371 369 struct mic_vdev *mvdev = data;
372 370 struct mic_device *mdev = mvdev->mdev;
373 371  
... ... @@ -394,7 +392,7 @@
394 392 }
395 393  
396 394 if (copy_from_user(mic_vq_configspace(mvdev->dd),
397   - argp, mvdev->dd->config_len)) {
  395 + argp, mvdev->dd->config_len)) {
398 396 dev_err(mic_dev(mvdev), "%s %d err %d\n",
399 397 __func__, __LINE__, -EFAULT);
400 398 ret = -EFAULT;
... ... @@ -438,8 +436,8 @@
438 436 return -EFAULT;
439 437 }
440 438  
441   - if (mic_aligned_desc_size(&dd) > MIC_MAX_DESC_BLK_SIZE
442   - || dd.num_vq > MIC_MAX_VRINGS) {
  439 + if (mic_aligned_desc_size(&dd) > MIC_MAX_DESC_BLK_SIZE ||
  440 + dd.num_vq > MIC_MAX_VRINGS) {
443 441 dev_err(mic_dev(mvdev), "%s %d err %d\n",
444 442 __func__, __LINE__, -EINVAL);
445 443 return -EINVAL;
... ... @@ -503,7 +501,7 @@
503 501 {
504 502 struct mic_device_ctrl *dc;
505 503  
506   - dc = mvdev->dc = (void *)devpage + mic_aligned_desc_size(devpage);
  504 + dc = (void *)devpage + mic_aligned_desc_size(devpage);
507 505  
508 506 dc->config_change = 0;
509 507 dc->guest_ack = 0;
... ... @@ -512,6 +510,7 @@
512 510 dc->used_address_updated = 0;
513 511 dc->c2h_vdev_db = -1;
514 512 dc->h2c_vdev_db = -1;
  513 + mvdev->dc = dc;
515 514 }
516 515  
517 516 int mic_virtio_add_device(struct mic_vdev *mvdev,
... ... @@ -551,7 +550,7 @@
551 550 sizeof(struct _mic_vring_info));
552 551 vr->va = (void *)
553 552 __get_free_pages(GFP_KERNEL | __GFP_ZERO,
554   - get_order(vr_size));
  553 + get_order(vr_size));
555 554 if (!vr->va) {
556 555 ret = -ENOMEM;
557 556 dev_err(mic_dev(mvdev), "%s %d err %d\n",
... ... @@ -564,8 +563,7 @@
564 563 vqconfig[i].address = mic_map_single(mdev,
565 564 vr->va, vr_size);
566 565 if (mic_map_error(vqconfig[i].address)) {
567   - free_pages((unsigned long)vr->va,
568   - get_order(vr_size));
  566 + free_pages((unsigned long)vr->va, get_order(vr_size));
569 567 ret = -ENOMEM;
570 568 dev_err(mic_dev(mvdev), "%s %d err %d\n",
571 569 __func__, __LINE__, ret);
... ... @@ -573,8 +571,7 @@
573 571 }
574 572 vqconfig[i].address = cpu_to_le64(vqconfig[i].address);
575 573  
576   - vring_init(&vr->vr, num,
577   - vr->va, MIC_VIRTIO_RING_ALIGN);
  574 + vring_init(&vr->vr, num, vr->va, MIC_VIRTIO_RING_ALIGN);
578 575 ret = vringh_init_kern(&mvr->vrh,
579 576 *(u32 *)mic_vq_features(mvdev->dd), num, false,
580 577 vr->vr.desc, vr->vr.avail, vr->vr.used);
... ... @@ -593,8 +590,8 @@
593 590 __func__, __LINE__, i, vr->va, vr->info, vr_size);
594 591 }
595 592  
596   - snprintf(irqname, sizeof(irqname),
597   - "mic%dvirtio%d", mdev->id, mvdev->virtio_id);
  593 + snprintf(irqname, sizeof(irqname), "mic%dvirtio%d", mdev->id,
  594 + mvdev->virtio_id);
598 595 mvdev->virtio_db = mic_next_db(mdev);
599 596 mvdev->virtio_cookie = mic_request_irq(mdev, mic_virtio_intr_handler,
600 597 irqname, mvdev, mvdev->virtio_db, MIC_INTR_DB);
601 598  
... ... @@ -628,9 +625,9 @@
628 625 for (j = 0; j < i; j++) {
629 626 struct mic_vringh *mvr = &mvdev->mvr[j];
630 627 mic_unmap_single(mdev, le64_to_cpu(vqconfig[j].address),
631   - mvr->vring.len);
  628 + mvr->vring.len);
632 629 free_pages((unsigned long)mvr->vring.va,
633   - get_order(mvr->vring.len));
  630 + get_order(mvr->vring.len));
634 631 }
635 632 mutex_unlock(&mdev->mic_mutex);
636 633 return ret;
637 634  
... ... @@ -676,9 +673,9 @@
676 673 vringh_kiov_cleanup(&mvr->riov);
677 674 vringh_kiov_cleanup(&mvr->wiov);
678 675 mic_unmap_single(mdev, le64_to_cpu(vqconfig[i].address),
679   - mvr->vring.len);
  676 + mvr->vring.len);
680 677 free_pages((unsigned long)mvr->vring.va,
681   - get_order(mvr->vring.len));
  678 + get_order(mvr->vring.len));
682 679 }
683 680  
684 681 list_for_each_safe(pos, tmp, &mdev->vdev_list) {
drivers/misc/mic/host/mic_x100.c
Diff comments   View file @ ced2c60
... ... @@ -46,8 +46,8 @@
46 46 dev_dbg(mdev->sdev->parent, "Writing 0x%x to scratch pad index %d\n",
47 47 val, idx);
48 48 mic_mmio_write(&mdev->mmio, val,
49   - MIC_X100_SBOX_BASE_ADDRESS +
50   - MIC_X100_SBOX_SPAD0 + idx * 4);
  49 + MIC_X100_SBOX_BASE_ADDRESS +
  50 + MIC_X100_SBOX_SPAD0 + idx * 4);
51 51 }
52 52  
53 53 /**
... ... @@ -130,8 +130,8 @@
130 130 {
131 131 struct mic_mw *mw = &mdev->mmio;
132 132 u64 apic_icr_offset = MIC_X100_SBOX_APICICR0 + doorbell * 8;
133   - u32 apicicr_low = mic_mmio_read(mw,
134   - MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset);
  133 + u32 apicicr_low = mic_mmio_read(mw, MIC_X100_SBOX_BASE_ADDRESS +
  134 + apic_icr_offset);
135 135  
136 136 /* for MIC we need to make sure we "hit" the send_icr bit (13) */
137 137 apicicr_low = (apicicr_low | (1 << 13));
... ... @@ -139,7 +139,7 @@
139 139 /* Ensure that the interrupt is ordered w.r.t. previous stores. */
140 140 wmb();
141 141 mic_mmio_write(mw, apicicr_low,
142   - MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset);
  142 + MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset);
143 143 }
144 144  
145 145 /**
... ... @@ -153,7 +153,7 @@
153 153 /* Ensure that the interrupt is ordered w.r.t. previous stores. */
154 154 wmb();
155 155 mic_mmio_write(&mdev->mmio, 0,
156   - MIC_X100_SBOX_BASE_ADDRESS + rdmasr_offset);
  156 + MIC_X100_SBOX_BASE_ADDRESS + rdmasr_offset);
157 157 }
158 158  
159 159 /**
... ... @@ -212,7 +212,7 @@
212 212 */
213 213 static void mic_x100_hw_intr_init(struct mic_device *mdev)
214 214 {
215   - mdev->intr_info = (struct mic_intr_info *) mic_x100_intr_init;
  215 + mdev->intr_info = (struct mic_intr_info *)mic_x100_intr_init;
216 216 }
217 217  
218 218 /**
... ... @@ -244,7 +244,7 @@
244 244 */
245 245 static void
246 246 mic_x100_program_msi_to_src_map(struct mic_device *mdev,
247   - int idx, int offset, bool set)
  247 + int idx, int offset, bool set)
248 248 {
249 249 unsigned long reg;
250 250 struct mic_mw *mw = &mdev->mmio;
251 251  
... ... @@ -308,12 +308,12 @@
308 308 apicicr_low = (vector | (1 << 13));
309 309  
310 310 mic_mmio_write(mw, mic_x100_get_apic_id(mdev),
311   - MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset + 4);
  311 + MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset + 4);
312 312  
313 313 /* Ensure that the interrupt is ordered w.r.t. previous stores. */
314 314 wmb();
315 315 mic_mmio_write(mw, apicicr_low,
316   - MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset);
  316 + MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset);
317 317 }
318 318  
319 319 /**
... ... @@ -365,8 +365,7 @@
365 365 len += snprintf(buf, CMDLINE_SIZE - len,
366 366 " mem=%dM", boot_mem);
367 367 if (mdev->cmdline)
368   - snprintf(buf + len, CMDLINE_SIZE - len,
369   - " %s", mdev->cmdline);
  368 + snprintf(buf + len, CMDLINE_SIZE - len, " %s", mdev->cmdline);
370 369 memcpy_toio(cmd_line_va, buf, strlen(buf) + 1);
371 370 kfree(buf);
372 371 return 0;
... ... @@ -397,8 +396,7 @@
397 396 * Typically the bootaddr for card OS is 64M
398 397 * so copy over the ramdisk @ 128M.
399 398 */
400   - memcpy_toio(mdev->aper.va + (mdev->bootaddr << 1),
401   - fw->data, fw->size);
  399 + memcpy_toio(mdev->aper.va + (mdev->bootaddr << 1), fw->data, fw->size);
402 400 iowrite32(cpu_to_le32(mdev->bootaddr << 1), &bp->hdr.ramdisk_image);
403 401 iowrite32(cpu_to_le32(fw->size), &bp->hdr.ramdisk_size);
404 402 release_firmware(fw);
... ... @@ -484,8 +482,7 @@
484 482 if (mdev->ramdisk)
485 483 rc = mic_x100_load_ramdisk(mdev);
486 484 error:
487   - dev_dbg(mdev->sdev->parent, "%s %d rc %d\n",
488   - __func__, __LINE__, rc);
  485 + dev_dbg(mdev->sdev->parent, "%s %d rc %d\n", __func__, __LINE__, rc);
489 486 done:
490 487 return rc;
491 488 }
... ... @@ -524,8 +521,8 @@
524 521 uint32_t smpt_reg_val = BUILD_SMPT(SNOOP_ON,
525 522 dma_addr >> mdev->smpt->info.page_shift);
526 523 mic_mmio_write(&mdev->mmio, smpt_reg_val,
527   - MIC_X100_SBOX_BASE_ADDRESS +
528   - MIC_X100_SBOX_SMPT00 + (4 * index));
  524 + MIC_X100_SBOX_BASE_ADDRESS +
  525 + MIC_X100_SBOX_SMPT00 + (4 * index));
529 526 }
530 527  
531 528 /**