diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 |
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/media/platform/intel/pxa_camera.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/media/platform/intel/pxa_camera.c')
| -rw-r--r-- | drivers/media/platform/intel/pxa_camera.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/platform/intel/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c index 54270d6b6f50..9ed3c2e063de 100644 --- a/drivers/media/platform/intel/pxa_camera.c +++ b/drivers/media/platform/intel/pxa_camera.c @@ -1794,8 +1794,8 @@ static int pxac_vidioc_try_fmt_vid_cap(struct file *filp, void *priv, struct v4l2_pix_format *pix = &f->fmt.pix; struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_state pad_state = { - .pads = &pad_cfg - }; + .pads = &pad_cfg, + }; struct v4l2_subdev_format format = { .which = V4L2_SUBDEV_FORMAT_TRY, }; @@ -2421,7 +2421,7 @@ exit_free_dma_y: return err; } -static int pxa_camera_remove(struct platform_device *pdev) +static void pxa_camera_remove(struct platform_device *pdev) { struct pxa_camera_dev *pcdev = platform_get_drvdata(pdev); @@ -2437,8 +2437,6 @@ static int pxa_camera_remove(struct platform_device *pdev) v4l2_device_unregister(&pcdev->v4l2_dev); dev_info(&pdev->dev, "PXA Camera driver unloaded\n"); - - return 0; } static const struct dev_pm_ops pxa_camera_pm = { @@ -2459,7 +2457,7 @@ static struct platform_driver pxa_camera_driver = { .of_match_table = of_match_ptr(pxa_camera_of_match), }, .probe = pxa_camera_probe, - .remove = pxa_camera_remove, + .remove_new = pxa_camera_remove, }; module_platform_driver(pxa_camera_driver); |