[PATCH v2 09/15] [media] lirc_dev: merge three if statements in only one

[Andi Shyti]

The three if statements check the same thing, merge them in only
one statement.

Signed-off-by: Andi Shyti <andi.sh...@samsung.com>
---
 drivers/media/rc/lirc_dev.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 2643336..d98a9f1 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -270,15 +270,10 @@ static int lirc_allocate_driver(struct lirc_driver *d)
                        dev_err(d->dev, "add_to_buf not set\n");
                        return -EBADRQC;
                }
-       } else if (!(d->fops && d->fops->read) && !d->rbuf) {
-               dev_err(d->dev, "fops->read and rbuf are NULL!\n");
+       } else if (!d->rbuf && !(d->fops && d->fops->read &&
+                               d->fops->poll && d->fops->unlocked_ioctl)) {
+               dev_err(d->dev, "undefined read, poll, ioctl\n");
                return -EBADRQC;
-       } else if (!d->rbuf) {
-               if (!(d->fops && d->fops->read && d->fops->poll &&
-                     d->fops->unlocked_ioctl)) {
-                       dev_err(d->dev, "undefined read, poll, ioctl\n");
-                       return -EBADRQC;
-               }
        }
 
        mutex_lock(&lirc_dev_lock);
-- 
2.8.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html