Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: 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,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
	sakari.ailus@iki.fi
Subject: Re: [PATCH 07/14] media: omap3isp: remove unused clkdev
Date: Tue, 7 Apr 2015 13:45:36 +0100
Message-ID: <20150407124536.GK4027@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1894989.AGoQvgsks0@avalon>

On Tue, Apr 07, 2015 at 12:42:52PM +0300, Laurent Pinchart wrote:
> Hello Russell,
> 
> On Sunday 05 April 2015 15:20:34 Russell King - ARM Linux wrote:
> > On Sat, Apr 04, 2015 at 12:44:35AM +0300, Laurent Pinchart wrote:
> > > Hi Russell,
> > > 
> > > Thank you for the patch;
> > > 
> > > On Friday 03 April 2015 18:12:58 Russell King wrote:
> > > > 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>
> > > 
> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > 
> > > with one caveat though : it conflicts with patches queued for v4.1 in the
> > > media tree. I'll post a rebased version in a reply to your e-mail. How
> > > would you like to handle the conflict ?
> > 
> > How bad is the conflict?
> 
> It's not too bad, it's mostly a context-related conflict. There are two 
> additional lines to remove (plus the associated comment) from isp_xclk_init(), 
> as your patch makes a loop now terminate with if (condition) continue;. Those 
> two lines could be removed later, keeping them doesn't break anything.

I think it's fine to take it through the media tree as the series doesn't
have any dependencies on this patch.  It was merely attempting to get rid
of stuff so that we could move closer to clkdev dealing with a clk_hw
rather than a struct clk - but I never made it that far with the series.
Maybe at a later date... :)

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

  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 ` [PATCH 07/14] media: omap3isp: remove unused clkdev Russell King
2015-04-03 21:44   ` 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 [this message]
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=20150407124536.GK4027@n2100.arm.linux.org.uk \
    --to=linux@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 \
    --cc=sakari.ailus@iki.fi \
    /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