redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Ashutosh Dixit 2013-09-27 09:49:53 -07:00 committed by Greg Kroah-Hartman
parent 4aa79961a5
commit ced2c60fb5
12 changed files with 158 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/mic/mpssd/mpssd.c
View File

@ -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),

1
drivers/misc/mic/card/mic_device.c
View File

@ -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);
}
/**

3
drivers/misc/mic/card/mic_virtio.c
View File

@ -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;

36
drivers/misc/mic/host/mic_debugfs.c
View File

@ -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);
}
/**

4
drivers/misc/mic/host/mic_fops.c
View File

@ -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;
}

16
drivers/misc/mic/host/mic_intr.c
View File

@ -71,8 +71,8 @@ static irqreturn_t mic_interrupt(int irq, void *dev)
/* Return the interrupt offset from the index. Index is 0 based. */
static u16 mic_map_src_to_offset(struct mic_device *mdev,
int intr_src, enum mic_intr_type type) {
int intr_src, enum mic_intr_type type)
{
if (type >= MIC_NUM_INTR_TYPES)
return MIC_NUM_OFFSETS;
if (intr_src >= mdev->intr_info->intr_len[type])
@ -112,7 +112,7 @@ static struct mic_intr_cb *mic_register_intr_callback(struct mic_device *mdev,
struct mic_intr_cb *intr_cb;
unsigned long flags;
int rc;
intr_cb = kmalloc(sizeof(struct mic_intr_cb), GFP_KERNEL);
intr_cb = kmalloc(sizeof(*intr_cb), GFP_KERNEL);
if (!intr_cb)
return ERR_PTR(-ENOMEM);
@ -182,9 +182,10 @@ static u8 mic_unregister_intr_callback(struct mic_device *mdev, u32 idx)
static int mic_setup_msix(struct mic_device *mdev, struct pci_dev *pdev)
{
int rc, i;
int entry_size = sizeof(*mdev->irq_info.msix_entries);
mdev->irq_info.msix_entries = kmalloc(sizeof(struct msix_entry) *
MIC_MIN_MSIX, GFP_KERNEL);
mdev->irq_info.msix_entries = kmalloc_array(MIC_MIN_MSIX,
entry_size, GFP_KERNEL);
if (!mdev->irq_info.msix_entries) {
rc = -ENOMEM;
goto err_nomem1;
@ -231,8 +232,9 @@ static int mic_setup_callbacks(struct mic_device *mdev)
{
int i;
mdev->irq_info.cb_list = kmalloc(sizeof(struct list_head) *
MIC_NUM_OFFSETS, GFP_KERNEL);
mdev->irq_info.cb_list = kmalloc_array(MIC_NUM_OFFSETS,
sizeof(*mdev->irq_info.cb_list),
GFP_KERNEL);
if (!mdev->irq_info.cb_list)
return -ENOMEM;

4
drivers/misc/mic/host/mic_smpt.c
View File

@ -366,8 +366,8 @@ int mic_smpt_init(struct mic_device *mdev)
smpt_info = mdev->smpt;
mdev->smpt_ops->init(mdev);
smpt_info->entry = kmalloc(sizeof(struct mic_smpt)
* smpt_info->info.num_reg, GFP_KERNEL);
smpt_info->entry = kmalloc_array(smpt_info->info.num_reg,
sizeof(*smpt_info->entry), GFP_KERNEL);
if (!smpt_info->entry) {
err = -ENOMEM;
goto free_smpt;

21
drivers/misc/mic/host/mic_virtio.c
View File

@ -225,8 +225,7 @@ static int _mic_virtio_copy(struct mic_vdev *mvdev,
* Update the used ring if a descriptor was available and some data was
* copied in/out and the user asked for a used ring update.
*/
if (*head != USHRT_MAX && copy->out_len &&
copy->update_used) {
if (*head != USHRT_MAX && copy->out_len && copy->update_used) {
u32 total = 0;
/* Determine the total data consumed */
@ -367,7 +366,6 @@ void mic_bh_handler(struct work_struct *work)
static irqreturn_t mic_virtio_intr_handler(int irq, void *data)
{
struct mic_vdev *mvdev = data;
struct mic_device *mdev = mvdev->mdev;
@ -438,8 +436,8 @@ static int mic_copy_dp_entry(struct mic_vdev *mvdev,
return -EFAULT;
}
if (mic_aligned_desc_size(&dd) > MIC_MAX_DESC_BLK_SIZE
|| dd.num_vq > MIC_MAX_VRINGS) {
if (mic_aligned_desc_size(&dd) > MIC_MAX_DESC_BLK_SIZE ||
dd.num_vq > MIC_MAX_VRINGS) {
dev_err(mic_dev(mvdev), "%s %d err %d\n",
__func__, __LINE__, -EINVAL);
return -EINVAL;
@ -503,7 +501,7 @@ static void mic_init_device_ctrl(struct mic_vdev *mvdev,
{
struct mic_device_ctrl *dc;
dc = mvdev->dc = (void *)devpage + mic_aligned_desc_size(devpage);
dc = (void *)devpage + mic_aligned_desc_size(devpage);
dc->config_change = 0;
dc->guest_ack = 0;
@ -512,6 +510,7 @@ static void mic_init_device_ctrl(struct mic_vdev *mvdev,
dc->used_address_updated = 0;
dc->c2h_vdev_db = -1;
dc->h2c_vdev_db = -1;
mvdev->dc = dc;
}
int mic_virtio_add_device(struct mic_vdev *mvdev,
@ -564,8 +563,7 @@ int mic_virtio_add_device(struct mic_vdev *mvdev,
vqconfig[i].address = mic_map_single(mdev,
vr->va, vr_size);
if (mic_map_error(vqconfig[i].address)) {
free_pages((unsigned long)vr->va,
get_order(vr_size));
free_pages((unsigned long)vr->va, get_order(vr_size));
ret = -ENOMEM;
dev_err(mic_dev(mvdev), "%s %d err %d\n",
__func__, __LINE__, ret);
@ -573,8 +571,7 @@ int mic_virtio_add_device(struct mic_vdev *mvdev,
}
vqconfig[i].address = cpu_to_le64(vqconfig[i].address);
vring_init(&vr->vr, num,
vr->va, MIC_VIRTIO_RING_ALIGN);
vring_init(&vr->vr, num, vr->va, MIC_VIRTIO_RING_ALIGN);
ret = vringh_init_kern(&mvr->vrh,
*(u32 *)mic_vq_features(mvdev->dd), num, false,
vr->vr.desc, vr->vr.avail, vr->vr.used);
@ -593,8 +590,8 @@ int mic_virtio_add_device(struct mic_vdev *mvdev,
__func__, __LINE__, i, vr->va, vr->info, vr_size);
}
snprintf(irqname, sizeof(irqname),
"mic%dvirtio%d", mdev->id, mvdev->virtio_id);
snprintf(irqname, sizeof(irqname), "mic%dvirtio%d", mdev->id,
mvdev->virtio_id);
mvdev->virtio_db = mic_next_db(mdev);
mvdev->virtio_cookie = mic_request_irq(mdev, mic_virtio_intr_handler,
irqname, mvdev, mvdev->virtio_db, MIC_INTR_DB);

13
drivers/misc/mic/host/mic_x100.c
View File

@ -130,8 +130,8 @@ static void mic_x100_send_sbox_intr(struct mic_device *mdev,
{
struct mic_mw *mw = &mdev->mmio;
u64 apic_icr_offset = MIC_X100_SBOX_APICICR0 + doorbell * 8;
u32 apicicr_low = mic_mmio_read(mw,
MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset);
u32 apicicr_low = mic_mmio_read(mw, MIC_X100_SBOX_BASE_ADDRESS +
apic_icr_offset);
/* for MIC we need to make sure we "hit" the send_icr bit (13) */
apicicr_low = (apicicr_low | (1 << 13));
@ -365,8 +365,7 @@ mic_x100_load_command_line(struct mic_device *mdev, const struct firmware *fw)
len += snprintf(buf, CMDLINE_SIZE - len,
" mem=%dM", boot_mem);
if (mdev->cmdline)
snprintf(buf + len, CMDLINE_SIZE - len,
" %s", mdev->cmdline);
snprintf(buf + len, CMDLINE_SIZE - len, " %s", mdev->cmdline);
memcpy_toio(cmd_line_va, buf, strlen(buf) + 1);
kfree(buf);
return 0;
@ -397,8 +396,7 @@ mic_x100_load_ramdisk(struct mic_device *mdev)
* Typically the bootaddr for card OS is 64M
* so copy over the ramdisk @ 128M.
*/
memcpy_toio(mdev->aper.va + (mdev->bootaddr << 1),
fw->data, fw->size);
memcpy_toio(mdev->aper.va + (mdev->bootaddr << 1), fw->data, fw->size);
iowrite32(cpu_to_le32(mdev->bootaddr << 1), &bp->hdr.ramdisk_image);
iowrite32(cpu_to_le32(fw->size), &bp->hdr.ramdisk_size);
release_firmware(fw);
@ -484,8 +482,7 @@ mic_x100_load_firmware(struct mic_device *mdev, const char *buf)
if (mdev->ramdisk)
rc = mic_x100_load_ramdisk(mdev);
error:
dev_dbg(mdev->sdev->parent, "%s %d rc %d\n",
__func__, __LINE__, rc);
dev_dbg(mdev->sdev->parent, "%s %d rc %d\n", __func__, __LINE__, rc);
done:
return rc;
}