diff options
Diffstat (limited to 'drivers/media/i2c/max9286.c')
| -rw-r--r-- | drivers/media/i2c/max9286.c | 17 | 
1 files changed, 8 insertions, 9 deletions
| diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c index 1aa2c58fd38c..7c663fd587bb 100644 --- a/drivers/media/i2c/max9286.c +++ b/drivers/media/i2c/max9286.c @@ -606,19 +606,18 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv)  	if (!priv->nsources)  		return 0; -	v4l2_async_notifier_init(&priv->notifier); +	v4l2_async_nf_init(&priv->notifier);  	for_each_source(priv, source) {  		unsigned int i = to_index(priv, source);  		struct max9286_asd *mas; -		mas = v4l2_async_notifier_add_fwnode_subdev(&priv->notifier, -							    source->fwnode, -							    struct max9286_asd); +		mas = v4l2_async_nf_add_fwnode(&priv->notifier, source->fwnode, +					       struct max9286_asd);  		if (IS_ERR(mas)) {  			dev_err(dev, "Failed to add subdev for source %u: %ld",  				i, PTR_ERR(mas)); -			v4l2_async_notifier_cleanup(&priv->notifier); +			v4l2_async_nf_cleanup(&priv->notifier);  			return PTR_ERR(mas);  		} @@ -627,10 +626,10 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv)  	priv->notifier.ops = &max9286_notify_ops; -	ret = v4l2_async_subdev_notifier_register(&priv->sd, &priv->notifier); +	ret = v4l2_async_subdev_nf_register(&priv->sd, &priv->notifier);  	if (ret) {  		dev_err(dev, "Failed to register subdev_notifier"); -		v4l2_async_notifier_cleanup(&priv->notifier); +		v4l2_async_nf_cleanup(&priv->notifier);  		return ret;  	} @@ -642,8 +641,8 @@ static void max9286_v4l2_notifier_unregister(struct max9286_priv *priv)  	if (!priv->nsources)  		return; -	v4l2_async_notifier_unregister(&priv->notifier); -	v4l2_async_notifier_cleanup(&priv->notifier); +	v4l2_async_nf_unregister(&priv->notifier); +	v4l2_async_nf_cleanup(&priv->notifier);  }  static int max9286_s_stream(struct v4l2_subdev *sd, int enable) |