iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfio: ccw: remove unnecessary NULL checks of a pointer

Browse Source 
Remove several unnecessary checks for the @private pointer, since it
can never be NULL in these places.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170412090816.79108-2-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Dong Jia Shi 2017-04-12 11:08:15 +02:00 committed by Cornelia Huck
parent 1877888d0a
commit c9c31b07ba
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/s390/cio/vfio_ccw_fsm.c
View File

@ -161,12 +161,8 @@ err_out:
static void fsm_irq(struct vfio_ccw_private *private, static void fsm_irq(struct vfio_ccw_private *private,
enum vfio_ccw_event event) enum vfio_ccw_event event)
{ {
struct irb *irb; struct irb *irb = this_cpu_ptr(&cio_irb);
if (!private)
return;
irb = this_cpu_ptr(&cio_irb);
memcpy(&private->irb, irb, sizeof(*irb)); memcpy(&private->irb, irb, sizeof(*irb));
queue_work(vfio_ccw_work_q, &private->io_work); queue_work(vfio_ccw_work_q, &private->io_work);

17
drivers/s390/cio/vfio_ccw_ops.c
View File

@ -19,9 +19,6 @@ static int vfio_ccw_mdev_reset(struct mdev_device *mdev)
int ret; int ret;
private = dev_get_drvdata(mdev_parent_dev(mdev)); private = dev_get_drvdata(mdev_parent_dev(mdev));
if (!private)
return -ENODEV;
sch = private->sch; sch = private->sch;
/* /*
* TODO: * TODO:
@ -49,9 +46,6 @@ static int vfio_ccw_mdev_notifier(struct notifier_block *nb,
struct vfio_ccw_private *private = struct vfio_ccw_private *private =
container_of(nb, struct vfio_ccw_private, nb); container_of(nb, struct vfio_ccw_private, nb);
if (!private)
return NOTIFY_STOP;
/* /*
* Vendor drivers MUST unpin pages in response to an * Vendor drivers MUST unpin pages in response to an
* invalidation. * invalidation.
@ -134,9 +128,6 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev)
dev_get_drvdata(mdev_parent_dev(mdev)); dev_get_drvdata(mdev_parent_dev(mdev));
int ret; int ret;
if (!private)
goto out;
if ((private->state == VFIO_CCW_STATE_NOT_OPER) || if ((private->state == VFIO_CCW_STATE_NOT_OPER) ||
(private->state == VFIO_CCW_STATE_STANDBY)) (private->state == VFIO_CCW_STATE_STANDBY))
goto out; goto out;
@ -187,9 +178,6 @@ static ssize_t vfio_ccw_mdev_read(struct mdev_device *mdev,
return -EINVAL; return -EINVAL;
private = dev_get_drvdata(mdev_parent_dev(mdev)); private = dev_get_drvdata(mdev_parent_dev(mdev));
if (!private)
return -ENODEV;
region = &private->io_region; region = &private->io_region;
if (copy_to_user(buf, (void *)region + *ppos, count)) if (copy_to_user(buf, (void *)region + *ppos, count))
return -EFAULT; return -EFAULT;
@ -209,8 +197,6 @@ static ssize_t vfio_ccw_mdev_write(struct mdev_device *mdev,
return -EINVAL; return -EINVAL;
private = dev_get_drvdata(mdev_parent_dev(mdev)); private = dev_get_drvdata(mdev_parent_dev(mdev));
if (!private)
return -ENODEV;
if (private->state != VFIO_CCW_STATE_IDLE) if (private->state != VFIO_CCW_STATE_IDLE)
return -EACCES; return -EACCES;
@ -274,9 +260,6 @@ static int vfio_ccw_mdev_set_irqs(struct mdev_device *mdev,
return -EINVAL; return -EINVAL;
private = dev_get_drvdata(mdev_parent_dev(mdev)); private = dev_get_drvdata(mdev_parent_dev(mdev));
if (!private)
return -ENODEV;
ctx = &private->io_trigger; ctx = &private->io_trigger;
switch (flags & VFIO_IRQ_SET_DATA_TYPE_MASK) { switch (flags & VFIO_IRQ_SET_DATA_TYPE_MASK) {