UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: omap3isp: remove unused clkdev 

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>
This commit is contained in:
Russell King 2015-04-03 14:12:58 -03:00 committed by Mauro Carvalho Chehab
parent 9a1a8f9953
commit befd25a2bd
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/platform/omap3isp/isp.c
View File

@ -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;
@ -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)
@ -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);
}
}

1
drivers/media/platform/omap3isp/isp.h
View File

@ -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;

6
include/media/omap3isp.h
View File

@ -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);
};