[media] V4L: Drop bus_type check in v4l2-async match functions
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Fri, 19 Jul 2013 15:08:08 +0000 (12:08 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 30 Jul 2013 18:51:13 +0000 (15:51 -0300)
These match_* functions are internal callbacks and are always
invoked only after checking asd->bus_type. So drop redundant
checks in match_i2c() and match_platform() functions.
Acked-and-tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/v4l2-core/v4l2-async.c

index aae2417..ff87c29 100644 (file)
@@ -27,7 +27,6 @@ static bool match_i2c(struct device *dev, struct v4l2_async_subdev *asd)
 #if IS_ENABLED(CONFIG_I2C)
        struct i2c_client *client = i2c_verify_client(dev);
        return client &&
-               asd->bus_type == V4L2_ASYNC_BUS_I2C &&
                asd->match.i2c.adapter_id == client->adapter->nr &&
                asd->match.i2c.address == client->addr;
 #else
@@ -37,8 +36,7 @@ static bool match_i2c(struct device *dev, struct v4l2_async_subdev *asd)
 
 static bool match_platform(struct device *dev, struct v4l2_async_subdev *asd)
 {
-       return asd->bus_type == V4L2_ASYNC_BUS_PLATFORM &&
-               !strcmp(asd->match.platform.name, dev_name(dev));
+       return !strcmp(asd->match.platform.name, dev_name(dev));
 }
 
 static LIST_HEAD(subdev_list);