| Message ID | 20200806155822.3772-2-frederic.chen@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: change media_device_request_alloc to match media_ioctl_info | expand |
Hi Frederic, Thank you for the patch. On Thu, Aug 06, 2020 at 11:58:22PM +0800, frederic.chen@mediatek.com wrote: > From: Frederic Chen <frederic.chen@mediatek.com> > > We modified the type of media_device_request_alloc()'s second > parameter from int* to void* so that it can match the interface > defined in struct media_ioctl_info. > > Signed-off-by: Frederic Chen <frederic.chen@mediatek.com> This looks fine to me. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/mc/mc-device.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c > index da8088351135..6b66c2091bae 100644 > --- a/drivers/media/mc/mc-device.c > +++ b/drivers/media/mc/mc-device.c > @@ -370,9 +370,10 @@ static long media_device_get_topology(struct media_device *mdev, void *arg) > return ret; > } > > -static long media_device_request_alloc(struct media_device *mdev, > - int *alloc_fd) > +static long media_device_request_alloc(struct media_device *mdev, void *arg) > { > + int *alloc_fd = arg; > + > #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API > if (!mdev->ops || !mdev->ops->req_validate || !mdev->ops->req_queue) > return -ENOTTY; > @@ -407,7 +408,7 @@ static long copy_arg_to_user(void __user *uarg, void *karg, unsigned int cmd) > #define MEDIA_IOC_ARG(__cmd, func, fl, from_user, to_user) \ > [_IOC_NR(MEDIA_IOC_##__cmd)] = { \ > .cmd = MEDIA_IOC_##__cmd, \ > - .fn = (long (*)(struct media_device *, void *))func, \ > + .fn = func, \ > .flags = fl, \ > .arg_from_user = from_user, \ > .arg_to_user = to_user, \
diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c index da8088351135..6b66c2091bae 100644 --- a/drivers/media/mc/mc-device.c +++ b/drivers/media/mc/mc-device.c @@ -370,9 +370,10 @@ static long media_device_get_topology(struct media_device *mdev, void *arg) return ret; } -static long media_device_request_alloc(struct media_device *mdev, - int *alloc_fd) +static long media_device_request_alloc(struct media_device *mdev, void *arg) { + int *alloc_fd = arg; + #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API if (!mdev->ops || !mdev->ops->req_validate || !mdev->ops->req_queue) return -ENOTTY; @@ -407,7 +408,7 @@ static long copy_arg_to_user(void __user *uarg, void *karg, unsigned int cmd) #define MEDIA_IOC_ARG(__cmd, func, fl, from_user, to_user) \ [_IOC_NR(MEDIA_IOC_##__cmd)] = { \ .cmd = MEDIA_IOC_##__cmd, \ - .fn = (long (*)(struct media_device *, void *))func, \ + .fn = func, \ .flags = fl, \ .arg_from_user = from_user, \ .arg_to_user = to_user, \