Commit 2f101572 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Hans Verkuil
Browse files

media: uvcvideo: Create uvc_pm_(get|put) functions 



Most of the times that we have to call uvc_status_(get|put) we need to
call the usb_autopm_ functions.

Create a new pair of functions that automate this for us. This
simplifies the current code and future PM changes in the driver.

Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Message-ID: <20250327-uvc-granpower-ng-v6-2-35a2357ff348@chromium.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent 14f6e205

drivers/media/usb/uvc/uvc_v4l2.c

+24 −12
Original line number Diff line number Diff line
@@ -26,6 +26,27 @@ 


#include "uvcvideo.h"



int uvc_pm_get(struct uvc_device *dev)

{

	int ret;



	ret = usb_autopm_get_interface(dev->intf);

	if (ret)

		return ret;



	ret = uvc_status_get(dev);

	if (ret)

		usb_autopm_put_interface(dev->intf);



	return ret;

}



void uvc_pm_put(struct uvc_device *dev)

{

	uvc_status_put(dev);

	usb_autopm_put_interface(dev->intf);

}



static int uvc_acquire_privileges(struct uvc_fh *handle);



static int uvc_control_add_xu_mapping(struct uvc_video_chain *chain,
@@ -642,20 +663,13 @@ static int uvc_v4l2_open(struct file *file) 
	stream = video_drvdata(file);

	uvc_dbg(stream->dev, CALLS, "%s\n", __func__);



	ret = usb_autopm_get_interface(stream->dev->intf);

	if (ret < 0)

		return ret;



	/* Create the device handle. */

	handle = kzalloc(sizeof(*handle), GFP_KERNEL);

	if (handle == NULL) {

		usb_autopm_put_interface(stream->dev->intf);

	if (!handle)

		return -ENOMEM;

	}



	ret = uvc_status_get(stream->dev);

	ret = uvc_pm_get(stream->dev);

	if (ret) {

		usb_autopm_put_interface(stream->dev->intf);

		kfree(handle);

		return ret;

	}
@@ -690,9 +704,7 @@ static int uvc_v4l2_release(struct file *file) 
	kfree(handle);

	file->private_data = NULL;



	uvc_status_put(stream->dev);



	usb_autopm_put_interface(stream->dev->intf);

	uvc_pm_put(stream->dev);

	return 0;

}

drivers/media/usb/uvc/uvcvideo.h

+4 −0
Original line number Diff line number Diff line
@@ -768,6 +768,10 @@ void uvc_status_suspend(struct uvc_device *dev); 
int uvc_status_get(struct uvc_device *dev);

void uvc_status_put(struct uvc_device *dev);



/* PM */

int uvc_pm_get(struct uvc_device *dev);

void uvc_pm_put(struct uvc_device *dev);



/* Controls */

extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops;