diff options
| author | Jason Kim <sukbeom.kim@gmail.com> | 2023-03-28 12:14:59 +0900 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-04-11 18:54:01 +0200 |
| commit | a7687fec197596f23954225c99e183e90208bcbb (patch) | |
| tree | 06c8675cf9eb568c381dd5d9708d04d453ea4944 | |
| parent | 2649c1a20e8e399ee955d0e22192f9992662c3d2 (diff) | |
media: mc-device: remove unnecessary __must_check
In the file mc-device.c, the function
media_device_register_entity_notify() does not need to have the
__must_check attribute since it returns only a value of 0.
Therefore, we can remove this attribute and change the function's
return type.
Signed-off-by: Jason Kim <sukbeom.kim@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
| -rw-r--r-- | drivers/media/mc/mc-device.c | 3 | ||||
| -rw-r--r-- | drivers/media/usb/au0828/au0828-core.c | 9 | ||||
| -rw-r--r-- | include/media/media-device.h | 5 |
3 files changed, 5 insertions, 12 deletions
diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c index 25020d58eb06..8cee956e38d4 100644 --- a/drivers/media/mc/mc-device.c +++ b/drivers/media/mc/mc-device.c @@ -756,13 +756,12 @@ int __must_check __media_device_register(struct media_device *mdev, } EXPORT_SYMBOL_GPL(__media_device_register); -int __must_check media_device_register_entity_notify(struct media_device *mdev, +void media_device_register_entity_notify(struct media_device *mdev, struct media_entity_notify *nptr) { mutex_lock(&mdev->graph_mutex); list_add_tail(&nptr->list, &mdev->entity_notify); mutex_unlock(&mdev->graph_mutex); - return 0; } EXPORT_SYMBOL_GPL(media_device_register_entity_notify); diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index 400cf9bd26b9..b3a09d3ac7d2 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -627,14 +627,9 @@ static int au0828_media_device_register(struct au0828_dev *dev, /* register entity_notify callback */ dev->entity_notify.notify_data = (void *) dev; dev->entity_notify.notify = (void *) au0828_media_graph_notify; - ret = media_device_register_entity_notify(dev->media_dev, + media_device_register_entity_notify(dev->media_dev, &dev->entity_notify); - if (ret) { - dev_err(&udev->dev, - "Media Device register entity_notify Error: %d\n", - ret); - return ret; - } + /* set enable_source */ mutex_lock(&dev->media_dev->graph_mutex); dev->media_dev->source_priv = (void *) dev; diff --git a/include/media/media-device.h b/include/media/media-device.h index 86716ee7cc6c..2c146d0b2b1c 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -364,7 +364,7 @@ void media_device_unregister_entity(struct media_entity *entity); * media_entity_notify callbacks are invoked. */ -int __must_check media_device_register_entity_notify(struct media_device *mdev, +void media_device_register_entity_notify(struct media_device *mdev, struct media_entity_notify *nptr); /** @@ -444,11 +444,10 @@ static inline int media_device_register_entity(struct media_device *mdev, static inline void media_device_unregister_entity(struct media_entity *entity) { } -static inline int media_device_register_entity_notify( +static inline void media_device_register_entity_notify( struct media_device *mdev, struct media_entity_notify *nptr) { - return 0; } static inline void media_device_unregister_entity_notify( struct media_device *mdev, |