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

Commit 3c2ade01 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: Drop bus_type check in v4l2-async match functions 



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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 408ed992

drivers/media/v4l2-core/v4l2-async.c

+1 −3
Original line number Diff line number Diff line
@@ -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);