[media] smiapp: Call the clock "ext_clk"

As the clock framework makes it possible to assign a device specific name to
the clocks, remove the ability to use a named clock in the driver.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 7de9892fb6c9f65a53b2a24e5b563dc0b9ce5481..ae66d91bf7136c2e494432cea21d8359654f89a6 100644 (file)
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2363,11 +2363,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
        }
 
        if (!sensor->platform_data->set_xclk) {
-               sensor->ext_clk = devm_clk_get(&client->dev,
-                                       sensor->platform_data->ext_clk_name);
+               sensor->ext_clk = devm_clk_get(&client->dev, "ext_clk");
                if (IS_ERR(sensor->ext_clk)) {
-                       dev_err(&client->dev, "could not get clock %s\n",
-                               sensor->platform_data->ext_clk_name);
+                       dev_err(&client->dev, "could not get clock\n");
                        return -ENODEV;
                }
 
@@ -2375,8 +2373,7 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
                                    sensor->platform_data->ext_clk);
                if (rval < 0) {
                        dev_err(&client->dev,
-                               "unable to set clock %s freq to %u\n",
-                               sensor->platform_data->ext_clk_name,
+                               "unable to set clock freq to %u\n",
                                sensor->platform_data->ext_clk);
                        return -ENODEV;
                }

diff --git a/include/media/smiapp.h b/include/media/smiapp.h
index 07f96a89e189fa2a9414ca3ca8bb201b43b21ff4..0b8f124a630c03a966fc3760b5054239caac137b 100644 (file)
--- a/include/media/smiapp.h
+++ b/include/media/smiapp.h
@@ -77,7 +77,6 @@ struct smiapp_platform_data {
        struct smiapp_flash_strobe_parms *strobe_setup;
 
        int (*set_xclk)(struct v4l2_subdev *sd, int hz);
-       char *ext_clk_name;
        int xshutdown;                  /* gpio or SMIAPP_NO_XSHUTDOWN */
 };