renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
Code

media: Revert "media: v4l2-fwnode: Add a convenience function for registering subdevs with notifiers"

Browse Source 
The users of v4l2_async_register_fwnode_subdev() have switched to
parsing their endpoints and setting up async sub-device lists in their
notifiers locally, without using the endpoint parsing callbacks. There
are no more users of v4l2_async_register_fwnode_subdev() so this
convenience function can be removed.

This reverts commit 1634f0eded.

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Steve Longerbeam 2020-05-01 19:15:40 +02:00 committed by Mauro Carvalho Chehab
parent 0e63a5e4bb
commit acee6033c5
2 changed files with 0 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/media/v4l2-core/v4l2-fwnode.c
View File

@ -1323,68 +1323,6 @@ out_cleanup:
}
EXPORT_SYMBOL_GPL(v4l2_async_register_subdev_sensor_common);
int v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd,
size_t asd_struct_size,
unsigned int *ports,
unsigned int num_ports,
parse_endpoint_func parse_endpoint)
{
struct v4l2_async_notifier *notifier;
struct device *dev = sd->dev;
struct fwnode_handle *fwnode;
int ret;
if (WARN_ON(!dev))
return -ENODEV;
fwnode = dev_fwnode(dev);
if (!fwnode_device_is_available(fwnode))
return -ENODEV;
notifier = kzalloc(sizeof(*notifier), GFP_KERNEL);
if (!notifier)
return -ENOMEM;
v4l2_async_notifier_init(notifier);
if (!ports) {
ret = v4l2_async_notifier_parse_fwnode_endpoints(dev, notifier,
asd_struct_size,
parse_endpoint);
if (ret < 0)
goto out_cleanup;
} else {
unsigned int i;
for (i = 0; i < num_ports; i++) {
ret = v4l2_async_notifier_parse_fwnode_endpoints_by_port(dev, notifier, asd_struct_size, ports[i], parse_endpoint);
if (ret < 0)
goto out_cleanup;
}
}
ret = v4l2_async_subdev_notifier_register(sd, notifier);
if (ret < 0)
goto out_cleanup;
ret = v4l2_async_register_subdev(sd);
if (ret < 0)
goto out_unregister;
sd->subdev_notifier = notifier;
return 0;
out_unregister:
v4l2_async_notifier_unregister(notifier);
out_cleanup:
v4l2_async_notifier_cleanup(notifier);
kfree(notifier);
return ret;
}
EXPORT_SYMBOL_GPL(v4l2_async_register_fwnode_subdev);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");

38
include/media/v4l2-fwnode.h
View File

@ -20,7 +20,6 @@
#include <linux/types.h>
#include <media/v4l2-mediabus.h>
#include <media/v4l2-subdev.h>
struct fwnode_handle;
struct v4l2_async_notifier;
@ -490,43 +489,6 @@ v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev,
int v4l2_async_notifier_parse_fwnode_sensor_common(struct device *dev,
struct v4l2_async_notifier *notifier);
/**
* v4l2_async_register_fwnode_subdev - registers a sub-device to the
* asynchronous sub-device framework
* and parses fwnode endpoints
*
* @sd: pointer to struct &v4l2_subdev
* @asd_struct_size: size of the driver's async sub-device struct, including
* sizeof(struct v4l2_async_subdev). The &struct
* v4l2_async_subdev shall be the first member of
* the driver's async sub-device struct, i.e. both
* begin at the same memory address.
* @ports: array of port id's to parse for fwnode endpoints. If NULL, will
* parse all ports owned by the sub-device.
* @num_ports: number of ports in @ports array. Ignored if @ports is NULL.
* @parse_endpoint: Driver's callback function called on each V4L2 fwnode
* endpoint. Optional.
*
* This function is just like v4l2_async_register_subdev() with the
* exception that calling it will also allocate a notifier for the
* sub-device, parse the sub-device's firmware node endpoints using
* v4l2_async_notifier_parse_fwnode_endpoints() or
* v4l2_async_notifier_parse_fwnode_endpoints_by_port(), and
* registers the sub-device notifier. The sub-device is similarly
* unregistered by calling v4l2_async_unregister_subdev().
*
* While registered, the subdev module is marked as in-use.
*
* An error is returned if the module is no longer loaded on any attempts
* to register it.
*/
int
v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd,
size_t asd_struct_size,
unsigned int *ports,
unsigned int num_ports,
parse_endpoint_func parse_endpoint);
/* Helper macros to access the connector links. */
/** v4l2_connector_last_link - Helper macro to get the first