Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced2c60f authored by Ashutosh Dixit's avatar Ashutosh Dixit Committed by Greg Kroah-Hartman
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarNikhil Rao <nikhil.rao@intel.com>
Signed-off-by: default avatarHarshavardhan R Kharche <harshavardhan.r.kharche@intel.com>
Signed-off-by: default avatarSudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4aa79961

Documentation/mic/mpssd/mpssd.c

+33 −32
Original line number Diff line number Diff line
@@ -1033,7 +1033,8 @@ start_virtblk(struct mic_info *mic, struct mic_vring *vring) 
	}

	add_virtio_device(mic, &virtblk_dev_page.dd);

	if (MAP_FAILED == init_vr(mic, mic->mic_virtblk.virtio_block_fd,

		VIRTIO_ID_BLOCK, vring, NULL, virtblk_dev_page.dd.num_vq)) {

				  VIRTIO_ID_BLOCK, vring, NULL,

				  virtblk_dev_page.dd.num_vq)) {

		mpsslog("%s init_vr failed %s\n",

			mic->name, strerror(errno));

		return false;
@@ -1219,8 +1220,8 @@ virtio_block(void *arg) 
				status = 0;

				fos = mic->mic_virtblk.backend_addr +

					(hdr.sector * SECTOR_SIZE);

				buffer_desc_idx = desc_idx =

					next_desc(desc);

				buffer_desc_idx = next_desc(desc);

				desc_idx = buffer_desc_idx;

				for (desc = &vring.vr.desc[buffer_desc_idx];

				     desc->flags & VRING_DESC_F_NEXT;

				     desc_idx = next_desc(desc),

drivers/misc/mic/card/mic_device.c

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ struct mic_irq *mic_request_card_irq(irqreturn_t (*func)(int irq, void *data), 
	return (struct mic_irq *)cookie;

err:

	return ERR_PTR(rc);



}



/**

drivers/misc/mic/card/mic_virtio.c

+8 −9
Original line number Diff line number Diff line
@@ -199,8 +199,7 @@ static void mic_del_vq(struct virtqueue *vq, int n) 
	struct mic_vdev *mvdev = to_micvdev(vq->vdev);

	struct vring *vr = (struct vring *)(vq + 1);



	free_pages((unsigned long) vr->used,

		get_order(mvdev->used_size[n]));

	free_pages((unsigned long) vr->used, get_order(mvdev->used_size[n]));

	vring_del_virtqueue(vq);

	mic_card_unmap(mvdev->mdev, mvdev->vr[n]);

	mvdev->vr[n] = NULL;

drivers/misc/mic/host/mic_debugfs.c

+43 −47
Original line number Diff line number Diff line
@@ -321,8 +321,7 @@ static int mic_vdev_info_show(struct seq_file *s, void *unused) 
				seq_printf(s, "desc[%d] addr 0x%llx len %d",

					   j, desc->addr, desc->len);

				seq_printf(s, " flags 0x%x next %d\n",

					desc->flags,

					desc->next);

					   desc->flags, desc->next);

				desc++;

			}

			avail = vrh->vring.avail;
@@ -340,7 +339,8 @@ static int mic_vdev_info_show(struct seq_file *s, void *unused) 
				   used->flags, used->idx);

			for (j = 0; j < num; j++)

				seq_printf(s, "used ring[%d] id %d len %d\n",

					j, used->ring[j].id, used->ring[j].len);

					   j, used->ring[j].id,

					   used->ring[j].len);

		}

	}

	mutex_unlock(&mdev->mic_mutex);
@@ -400,8 +400,8 @@ static int mic_msi_irq_info_show(struct seq_file *s, void *pos) 
			seq_printf(s, "%-10s", "count:");

			for (j = (MIC_NUM_OFFSETS - 1); j >= 0; j--)

				seq_printf(s, "%4d ",

				(mdev->irq_info.mic_msi_map[i] & BIT(j)) ?

					1 : 0);

					   (mdev->irq_info.mic_msi_map[i] &

					   BIT(j)) ? 1 : 0);

			seq_puts(s, "\n\n");

		}

	} else {
@@ -409,7 +409,6 @@ static int mic_msi_irq_info_show(struct seq_file *s, void *pos) 
	}



	return 0;



}



static int mic_msi_irq_info_debug_open(struct inode *inode, struct file *file)
@@ -443,26 +442,23 @@ void mic_create_debug_dir(struct mic_device *mdev) 
	if (!mdev->dbg_dir)

		return;



	debugfs_create_file("log_buf", 0444, mdev->dbg_dir,

		mdev, &log_buf_ops);

	debugfs_create_file("log_buf", 0444, mdev->dbg_dir, mdev, &log_buf_ops);



	debugfs_create_file("smpt", 0444, mdev->dbg_dir,

		mdev, &smpt_file_ops);

	debugfs_create_file("smpt", 0444, mdev->dbg_dir, mdev, &smpt_file_ops);



	debugfs_create_file("soft_reset", 0444, mdev->dbg_dir,

		mdev, &soft_reset_ops);

	debugfs_create_file("soft_reset", 0444, mdev->dbg_dir, mdev,

			    &soft_reset_ops);



	debugfs_create_file("post_code", 0444, mdev->dbg_dir,

		mdev, &post_code_ops);

	debugfs_create_file("post_code", 0444, mdev->dbg_dir, mdev,

			    &post_code_ops);



	debugfs_create_file("dp", 0444, mdev->dbg_dir,

		mdev, &dp_ops);

	debugfs_create_file("dp", 0444, mdev->dbg_dir, mdev, &dp_ops);



	debugfs_create_file("vdev_info", 0444, mdev->dbg_dir,

		mdev, &vdev_info_ops);

	debugfs_create_file("vdev_info", 0444, mdev->dbg_dir, mdev,

			    &vdev_info_ops);



	debugfs_create_file("msi_irq_info", 0444, mdev->dbg_dir,

		mdev, &msi_irq_info_ops);

	debugfs_create_file("msi_irq_info", 0444, mdev->dbg_dir, mdev,

			    &msi_irq_info_ops);

}



/**

drivers/misc/mic/host/mic_fops.c

+3 −3
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ unsigned int mic_poll(struct file *f, poll_table *wait) 


	poll_wait(f, &mvdev->waitq, wait);



	if (mic_vdev_inited(mvdev))

	if (mic_vdev_inited(mvdev)) {

		mask = POLLERR;

	else if (mvdev->poll_wake) {

	} else if (mvdev->poll_wake) {

		mvdev->poll_wake = 0;

		mask = POLLIN | POLLOUT;

	}