From: Russell King <rmk+kernel@arm.linux.org.uk> To: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-omap@vger.kernel.org, linux-sh@vger.kernel.org Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Mauro Carvalho Chehab <mchehab@osg.samsung.com> Subject: [PATCH 07/14] media: omap3isp: remove unused clkdev Date: Fri, 03 Apr 2015 18:12:58 +0100 Message-ID: <E1Ye59O-0001BJ-Gq@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20150403171149.GC13898@n2100.arm.linux.org.uk> 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> --- drivers/media/platform/omap3isp/isp.c | 18 ------------------ drivers/media/platform/omap3isp/isp.h | 1 - include/media/omap3isp.h | 6 ------ 3 files changed, 25 deletions(-) diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index deca80903c3a..4d8078b9d010 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -281,7 +281,6 @@ static const struct clk_init_data isp_xclk_init_data = { static int isp_xclk_init(struct isp_device *isp) { - struct isp_platform_data *pdata = isp->pdata; struct clk_init_data init; unsigned int i; @@ -311,20 +310,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); - - if (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); } return 0; @@ -339,9 +324,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); } } diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h index cfdfc8714b6b..d41c98bbdfe7 100644 --- a/drivers/media/platform/omap3isp/isp.h +++ b/drivers/media/platform/omap3isp/isp.h @@ -122,7 +122,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; diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h index 398279dd1922..a9798525d01e 100644 --- a/include/media/omap3isp.h +++ b/include/media/omap3isp.h @@ -152,13 +152,7 @@ struct isp_v4l2_subdevs_group { } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */ }; -struct isp_platform_xclk { - const char *dev_id; - const char *con_id; -}; - struct isp_platform_data { - struct isp_platform_xclk xclks[2]; struct isp_v4l2_subdevs_group *subdevs; void (*set_constraints)(struct isp_device *isp, bool enable); }; -- 1.8.3.1
next prev parent reply index Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-03 17:11 [PATCH 00/14] Fix fallout from per-user struct clk patches Russell King - ARM Linux 2015-04-03 17:12 ` [PATCH 01/14] clk: update clk API documentation to clarify clk_round_rate() Russell King 2015-04-03 17:12 ` [PATCH 02/14] clkdev: drop __init from clkdev_add_table() Russell King 2015-04-03 17:12 ` [PATCH 03/14] clkdev: get rid of redundant clk_add_alias() prototype in linux/clk.h Russell King 2015-04-03 23:49 ` Tony Lindgren 2015-04-04 12:43 ` Robert Jarzmik 2015-04-04 12:53 ` Russell King - ARM Linux 2015-04-06 19:04 ` Stephen Boyd 2015-04-07 10:05 ` Robert Jarzmik 2015-04-07 12:42 ` Russell King - ARM Linux 2015-04-06 5:50 ` Sekhar Nori 2015-04-03 17:12 ` [PATCH 04/14] clkdev: const-ify connection id to clk_add_alias() Russell King 2015-04-03 17:12 ` [PATCH 05/14] clkdev: use clk_hw internally Russell King 2015-04-06 20:18 ` Stephen Boyd 2015-04-03 17:12 ` [PATCH 06/14] clkdev: add clkdev_create() helper Russell King 2015-04-06 20:19 ` Stephen Boyd 2015-04-07 12:43 ` Russell King - ARM Linux 2015-04-07 23:09 ` Stephen Boyd 2015-04-03 17:12 ` Russell King [this message] 2015-04-03 21:44 ` [PATCH 07/14] media: omap3isp: remove unused clkdev Laurent Pinchart 2015-04-05 14:20 ` Russell King - ARM Linux 2015-04-07 9:42 ` Laurent Pinchart 2015-04-07 12:45 ` Russell King - ARM Linux 2015-04-07 14:38 ` Laurent Pinchart 2015-04-03 17:13 ` [PATCH 08/14] SH: use clkdev_add_table() Russell King 2015-04-03 17:13 ` [PATCH 09/14] ARM: lpc32xx: convert to " Russell King 2015-04-03 17:13 ` [PATCH 10/14] ARM: orion: use clkdev_create() Russell King 2015-04-04 0:17 ` Andrew Lunn 2015-04-07 13:20 ` Gregory CLEMENT 2015-04-07 14:01 ` Russell King - ARM Linux 2015-04-07 14:20 ` Gregory CLEMENT 2015-04-03 17:13 ` [PATCH 11/14] ARM: omap2: " Russell King 2015-04-03 23:49 ` Tony Lindgren 2015-04-03 17:13 ` [PATCH 12/14] ARM: omap2: use clkdev_add_alias() Russell King 2015-04-03 23:50 ` Tony Lindgren 2015-04-03 17:13 ` [PATCH 13/14] ASoC: migor: use clkdev_create() Russell King 2015-04-03 17:13 ` [PATCH 14/14] clk: s2mps11: " Russell King 2015-04-03 17:16 ` [PATCH 00/14] Fix fallout from per-user struct clk patches Russell King - ARM Linux 2015-04-05 9:04 ` Geert Uytterhoeven 2015-04-05 14:13 ` Russell King - ARM Linux
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=E1Ye59O-0001BJ-Gq@rmk-PC.arm.linux.org.uk \ --to=rmk+kernel@arm.linux.org.uk \ --cc=alsa-devel@alsa-project.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=mchehab@osg.samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Alsa-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \ alsa-devel@alsa-project.org public-inbox-index alsa-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git