Skip to content

Commit

Permalink
[media] media: omap3isp: remove unused clkdev
Browse files Browse the repository at this point in the history
No merged platform supplies xclks via platform data.  As we want to
slightly change the clkdev interface, rather than fixing this unused
code, remove it instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
Russell King authored and Mauro Carvalho Chehab committed Apr 10, 2015
1 parent 9a1a8f9 commit befd25a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 31 deletions.
24 changes: 0 additions & 24 deletions drivers/media/platform/omap3isp/isp.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ static struct clk *isp_xclk_src_get(struct of_phandle_args *clkspec, void *data)

static int isp_xclk_init(struct isp_device *isp)
{
struct isp_platform_data *pdata = isp->pdata;
struct device_node *np = isp->dev->of_node;
struct clk_init_data init;
unsigned int i;
Expand Down Expand Up @@ -335,26 +334,6 @@ static int isp_xclk_init(struct isp_device *isp)
xclk->clk = clk_register(NULL, &xclk->hw);
if (IS_ERR(xclk->clk))
return PTR_ERR(xclk->clk);

/* When instantiated from DT we don't need to register clock
* aliases.
*/
if (np)
continue;

if (!pdata || (pdata->xclks[i].con_id == NULL &&
pdata->xclks[i].dev_id == NULL))
continue;

xclk->lookup = kzalloc(sizeof(*xclk->lookup), GFP_KERNEL);
if (xclk->lookup == NULL)
return -ENOMEM;

xclk->lookup->con_id = pdata->xclks[i].con_id;
xclk->lookup->dev_id = pdata->xclks[i].dev_id;
xclk->lookup->clk = xclk->clk;

clkdev_add(xclk->lookup);
}

if (np)
Expand All @@ -376,9 +355,6 @@ static void isp_xclk_cleanup(struct isp_device *isp)

if (!IS_ERR(xclk->clk))
clk_unregister(xclk->clk);

if (xclk->lookup)
clkdev_drop(xclk->lookup);
}
}

Expand Down
1 change: 0 additions & 1 deletion drivers/media/platform/omap3isp/isp.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ enum isp_xclk_id {
struct isp_xclk {
struct isp_device *isp;
struct clk_hw hw;
struct clk_lookup *lookup;
struct clk *clk;
enum isp_xclk_id id;

Expand Down
6 changes: 0 additions & 6 deletions include/media/omap3isp.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,7 @@ struct isp_platform_subdev {
struct isp_bus_cfg *bus;
};

struct isp_platform_xclk {
const char *dev_id;
const char *con_id;
};

struct isp_platform_data {
struct isp_platform_xclk xclks[2];
struct isp_platform_subdev *subdevs;
void (*set_constraints)(struct isp_device *isp, bool enable);
};
Expand Down

0 comments on commit befd25a

Please sign in to comment.