media: marvell: Simplify remove callback

Fold mmpcam_remove() into its only caller mmpcam_platform_remove(). Note
that cam can never be zero, as the probe function calls
platform_set_drvdata() with a non-NULL argument (or returns an error
code in which case .remove() won't be called).

Also use mmpcam_remove() as the function name for the remove callback to
align to mmpcam_probe() for .probe().

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/marvell/mmp-driver.c b/drivers/media/platform/marvell/mmp-driver.c
index ef22bf8f276ca5a8d68e098d259cc40fee926097..964c55eacd891e2ccfb5603c97f6426148452ca6 100644 (file)
--- a/drivers/media/platform/marvell/mmp-driver.c
+++ b/drivers/media/platform/marvell/mmp-driver.c
@@ -287,9 +287,9 @@ out:
        return ret;
 }
 
-
-static int mmpcam_remove(struct mmp_camera *cam)
+static int mmpcam_remove(struct platform_device *pdev)
 {
+       struct mmp_camera *cam = platform_get_drvdata(pdev);
        struct mcam_camera *mcam = &cam->mcam;
 
        mccic_shutdown(mcam);
@@ -297,15 +297,6 @@ static int mmpcam_remove(struct mmp_camera *cam)
        return 0;
 }
 
-static int mmpcam_platform_remove(struct platform_device *pdev)
-{
-       struct mmp_camera *cam = platform_get_drvdata(pdev);
-
-       if (cam == NULL)
-               return -ENODEV;
-       return mmpcam_remove(cam);
-}
-
 /*
  * Suspend/resume support.
  */
@@ -369,7 +360,7 @@ MODULE_DEVICE_TABLE(of, mmpcam_of_match);
 
 static struct platform_driver mmpcam_driver = {
        .probe          = mmpcam_probe,
-       .remove         = mmpcam_platform_remove,
+       .remove         = mmpcam_remove,
        .driver = {
                .name   = "mmp-camera",
                .of_match_table = of_match_ptr(mmpcam_of_match),