From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Machek Subject: Re: [PATCH 7/8] smiapp: Add support for flash, lens and EEPROM devices Date: Sat, 17 Jun 2017 23:12:35 +0200 Message-ID: <20170617211234.GA30157@amd> References: <1497433639-13101-1-git-send-email-sakari.ailus@linux.intel.com> <1497433639-13101-8-git-send-email-sakari.ailus@linux.intel.com> <20170616124242.GA8145@amd> <20170616124526.GM15419@paasikivi.fi.intel.com> <20170617125919.GB13133@amd> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="a8Wt8u1KmwUX3Y2C" Return-path: Content-Disposition: inline In-Reply-To: <20170617125919.GB13133@amd> Sender: linux-leds-owner@vger.kernel.org To: Sakari Ailus Cc: linux-media@vger.kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, sebastian.reichel@collabora.co.uk, robh@kernel.org List-Id: devicetree@vger.kernel.org --a8Wt8u1KmwUX3Y2C Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi! > > > This is quite a lot of boilerplate for that. Would it make sense to > > > provide helper function at least for this? > >=20 > > Yes. I've been thinking of having helper functions for notifiers and > > sub-notifiers. Most of the receiver drivers are implementing exactly the > > same thing but with different twists (read: bugs). >=20 > Perhaps something like this is a starting point? And here's tested version that actually works for me. Wants moving to common code, perhaps renaming functions. Signed-off-by: Pavel Machek Best regards, Pavel diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c b/drivers/media/i2c/e= t8ek8/et8ek8_driver.c index 05b9bd9..4674939 100644 --- a/drivers/media/i2c/et8ek8/et8ek8_driver.c +++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c @@ -32,13 +32,92 @@ #include #include #include -#include =20 +#include +#include #include #include #include #include =20 +static int simple_subdev_notifier_bound(struct v4l2_async_notifier *notifi= er, + struct v4l2_subdev *sd, + struct v4l2_async_subdev *asd) +{ + return 0; +} + +static int simple_subdev_notifier_complete( + struct v4l2_async_notifier *notifier) +{ + struct v4l2_async_notifier_simple *notifier_s =3D + container_of(notifier, struct v4l2_async_notifier_simple, n= otifier); + + return v4l2_device_register_subdev_nodes(notifier_s->v4l2_dev); +} + +static inline int v4l2_simple_subnotifier_register(struct v4l2_subdev *sub= dev, + struct v4l2_async_notifier_simple *notifier_s) +{ + struct v4l2_async_notifier *notifier =3D ¬ifier_s->notifier; + int rval; + + if (!notifier->num_subdevs) { + return 0; + } + + notifier_s->v4l2_dev =3D subdev->v4l2_dev; + notifier->bound =3D simple_subdev_notifier_bound; + notifier->complete =3D simple_subdev_notifier_complete; + rval =3D v4l2_async_subnotifier_register(subdev, notifier); + return rval; +} + +static inline int simple_subdev_probe(struct device *dev, + struct v4l2_async_notifier *notifier) +{ + static const char *props[] =3D { "flash", "lens" }; + unsigned int i; + const int max_subdevs =3D 3; +=09 + notifier->subdevs =3D + devm_kcalloc(dev, max_subdevs, + sizeof(struct v4l2_async_subdev *), GFP_KERNEL); + if (!notifier->subdevs) + return -ENOMEM; + + for (i =3D 0; i < ARRAY_SIZE(props); i++) { + struct device_node *node; + unsigned int j =3D 0; + + while ((node =3D of_parse_phandle(dev->of_node, props[i], j++))) { + struct v4l2_async_subdev **asd =3D + ¬ifier->subdevs[ + notifier->num_subdevs]; + + if (WARN_ON(notifier->num_subdevs >=3D max_subdevs)) { + of_node_put(node); + return 0; + } + + *asd =3D devm_kzalloc( + dev, sizeof(struct v4l2_async_subdev), + GFP_KERNEL); + if (!*asd) { + of_node_put(node); + return 0; + } + + (*asd)->match.fwnode.fwnode =3D of_fwnode_handle(node); + (*asd)->match_type =3D V4L2_ASYNC_MATCH_FWNODE; + notifier->num_subdevs++; + + of_node_put(node); + } + } + return 0; +} + #include "et8ek8_reg.h" =20 #define ET8EK8_NAME "et8ek8" @@ -67,6 +146,8 @@ struct et8ek8_sensor { =20 struct mutex power_lock; int power_count; + + struct v4l2_async_notifier_simple notifier_s; }; =20 #define to_et8ek8_sensor(sd) container_of(sd, struct et8ek8_sensor, subdev) @@ -1509,8 +1590,9 @@ et8ek8_registered(struct v4l2_subdev *subdev) dev_err(&client->dev, "controls initialization failed\n"); goto err_file; } - +=09 __et8ek8_get_pad_format(sensor, NULL, 0, V4L2_SUBDEV_FORMAT_ACTIVE); + v4l2_simple_subnotifier_register(subdev, &sensor->notifier_s); =20 return 0; =20 @@ -1663,7 +1745,13 @@ static int et8ek8_probe(struct i2c_client *client, return ret; } =20 + sensor->subdev.entity.function =3D MEDIA_ENT_F_CAM_SENSOR; + mutex_init(&sensor->power_lock); +=09 + ret =3D simple_subdev_probe(dev, &sensor->notifier_s.notifier); + if (ret < 0) + printk("Simple subdev probe failed\n"); =20 v4l2_i2c_subdev_init(&sensor->subdev, client, &et8ek8_ops); sensor->subdev.flags |=3D V4L2_SUBDEV_FL_HAS_DEVNODE; @@ -1703,6 +1791,7 @@ static int __exit et8ek8_remove(struct i2c_client *cl= ient) } =20 v4l2_device_unregister_subdev(&sensor->subdev); + /* FIXME: v4l2_async_subnotifier_unregister(&sensor->notifier_s.notifier)= ; */ device_remove_file(&client->dev, &dev_attr_priv_mem); v4l2_ctrl_handler_free(&sensor->ctrl_handler); v4l2_async_unregister_subdev(&sensor->subdev); diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h index f7e2a1a..63bcf80 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -104,6 +104,11 @@ struct v4l2_async_notifier { struct v4l2_async_subdev *asd); }; =20 +struct v4l2_async_notifier_simple { + struct v4l2_async_notifier notifier; + struct v4l2_device * v4l2_dev; +}; + /** * v4l2_async_notifier_register - registers a subdevice asynchronous subno= tifier * --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --a8Wt8u1KmwUX3Y2C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAllFm0IACgkQMOfwapXb+vJ3PwCgvwrI0tjfnpj/wE9caP67OXrl ZbUAnjXk6v2ZNK5k1txjE0LfrtSiV9e5 =5x/a -----END PGP SIGNATURE----- --a8Wt8u1KmwUX3Y2C--