All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Mon, 14 May 2012 18:51:16 +1000	[thread overview]
Message-ID: <20120514185116.fcde1a3be2fbaae3c4b5f279@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap2/displays/panel-taal.c between commit 9c3d5eb71b1f
("OMAP: DSS2: Remove suspicous and unused TAAL regulator API usage") from
the omap_dss2 tree and commit 3acc797c1db2 ("OMAPDSS: Taal: move reset
gpio handling to taal driver") from the arm-soc tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/video/omap2/displays/panel-taal.c
index 3053399,b2dd88b..0000000
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@@ -992,8 -1082,13 +1001,11 @@@ err_gpio
  	if (bldev != NULL)
  		backlight_device_unregister(bldev);
  err_bl:
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ err_rst_gpio:
  	destroy_workqueue(td->workqueue);
  err_wq:
 -	free_regulators(panel_config->regulators, panel_config->num_regulators);
 -err_reg:
  	kfree(td);
  err:
  	return r;
@@@ -1030,6 -1125,12 +1042,9 @@@ static void __exit taal_remove(struct o
  	/* reset, to be sure that the panel is in a valid state */
  	taal_hw_reset(dssdev);
  
 -	free_regulators(td->panel_config->regulators,
 -			td->panel_config->num_regulators);
 -
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ 
  	kfree(td);
  }
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Mon, 14 May 2012 18:51:16 +1000	[thread overview]
Message-ID: <20120514185116.fcde1a3be2fbaae3c4b5f279@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap2/displays/panel-taal.c between commit 9c3d5eb71b1f
("OMAP: DSS2: Remove suspicous and unused TAAL regulator API usage") from
the omap_dss2 tree and commit 3acc797c1db2 ("OMAPDSS: Taal: move reset
gpio handling to taal driver") from the arm-soc tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/video/omap2/displays/panel-taal.c
index 3053399,b2dd88b..0000000
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@@ -992,8 -1082,13 +1001,11 @@@ err_gpio
  	if (bldev != NULL)
  		backlight_device_unregister(bldev);
  err_bl:
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ err_rst_gpio:
  	destroy_workqueue(td->workqueue);
  err_wq:
 -	free_regulators(panel_config->regulators, panel_config->num_regulators);
 -err_reg:
  	kfree(td);
  err:
  	return r;
@@@ -1030,6 -1125,12 +1042,9 @@@ static void __exit taal_remove(struct o
  	/* reset, to be sure that the panel is in a valid state */
  	taal_hw_reset(dssdev);
  
 -	free_regulators(td->panel_config->regulators,
 -			td->panel_config->num_regulators);
 -
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ 
  	kfree(td);
  }
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Mon, 14 May 2012 18:51:16 +1000	[thread overview]
Message-ID: <20120514185116.fcde1a3be2fbaae3c4b5f279@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap2/displays/panel-taal.c between commit 9c3d5eb71b1f
("OMAP: DSS2: Remove suspicous and unused TAAL regulator API usage") from
the omap_dss2 tree and commit 3acc797c1db2 ("OMAPDSS: Taal: move reset
gpio handling to taal driver") from the arm-soc tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/video/omap2/displays/panel-taal.c
index 3053399,b2dd88b..0000000
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@@ -992,8 -1082,13 +1001,11 @@@ err_gpio
  	if (bldev != NULL)
  		backlight_device_unregister(bldev);
  err_bl:
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ err_rst_gpio:
  	destroy_workqueue(td->workqueue);
  err_wq:
 -	free_regulators(panel_config->regulators, panel_config->num_regulators);
 -err_reg:
  	kfree(td);
  err:
  	return r;
@@@ -1030,6 -1125,12 +1042,9 @@@ static void __exit taal_remove(struct o
  	/* reset, to be sure that the panel is in a valid state */
  	taal_hw_reset(dssdev);
  
 -	free_regulators(td->panel_config->regulators,
 -			td->panel_config->num_regulators);
 -
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ 
  	kfree(td);
  }
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120514/aba3be8b/attachment.sig>

             reply	other threads:[~2012-05-14  8:51 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-14  8:51 Stephen Rothwell [this message]
2012-05-14  8:51 ` linux-next: manual merge of the arm-soc tree with the omap_dss2 tree Stephen Rothwell
2012-05-14  8:51 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2013-04-09  7:40 Stephen Rothwell
2013-04-09  7:40 ` Stephen Rothwell
2013-04-09  7:40 ` Stephen Rothwell
2013-04-09  9:32 ` Arnd Bergmann
2013-04-09  9:32   ` Arnd Bergmann
2013-04-09  9:32   ` Arnd Bergmann
2012-12-03  5:52 Stephen Rothwell
2012-12-03  5:52 ` Stephen Rothwell
2012-12-03  5:52 ` Stephen Rothwell
2012-11-30  5:18 Stephen Rothwell
2012-11-30  5:18 ` Stephen Rothwell
2012-11-30  5:18 ` Stephen Rothwell
2012-11-26 10:56 Stephen Rothwell
2012-11-26 10:56 ` Stephen Rothwell
2012-11-26 10:56 ` Stephen Rothwell
2012-11-26 15:53 ` Tony Lindgren
2012-11-26 15:53   ` Tony Lindgren
2012-09-24  9:53 Stephen Rothwell
2012-09-24  9:53 ` Stephen Rothwell
2012-09-24  9:53 ` Stephen Rothwell
2012-09-24 12:43 ` Arnd Bergmann
2012-09-24 12:43   ` Arnd Bergmann
2012-09-24 13:11   ` Tomi Valkeinen
2012-09-24 13:11     ` Tomi Valkeinen
2012-09-24 16:19     ` Tony Lindgren
2012-09-24 16:19       ` Tony Lindgren
2012-09-17  9:23 Stephen Rothwell
2012-09-17  9:23 ` Stephen Rothwell
2012-09-17  9:23 ` Stephen Rothwell
2012-03-13  8:21 Stephen Rothwell
2012-03-13  8:21 ` Stephen Rothwell
2012-03-13  8:21 ` Stephen Rothwell
2012-03-09  7:09 Stephen Rothwell
2012-03-09  7:09 ` Stephen Rothwell
2012-03-09  7:09 ` Stephen Rothwell
2012-03-08  6:00 Stephen Rothwell
2012-03-08  6:00 ` Stephen Rothwell
2012-03-08  6:00 ` Stephen Rothwell
2012-03-08 16:16 ` Arnd Bergmann
2012-03-08 16:16   ` Arnd Bergmann
2012-03-09  9:35   ` Tomi Valkeinen
2012-03-09  9:35     ` Tomi Valkeinen
2012-03-09 11:50     ` Arnd Bergmann
2012-03-09 11:50       ` Arnd Bergmann
2012-03-09 12:14       ` Tomi Valkeinen
2012-03-09 12:14         ` Tomi Valkeinen
2012-03-09 12:26         ` Arnd Bergmann
2012-03-09 12:26           ` Arnd Bergmann
2012-03-09 12:31           ` Tomi Valkeinen
2012-03-09 12:31             ` Tomi Valkeinen
2012-03-08  5:58 Stephen Rothwell
2012-03-08  5:58 ` Stephen Rothwell
2012-03-08  5:58 ` Stephen Rothwell
2012-03-08  5:55 Stephen Rothwell
2012-03-08  5:55 ` Stephen Rothwell
2012-03-08  5:55 ` Stephen Rothwell
2012-03-08  5:51 Stephen Rothwell
2012-03-08  5:51 ` Stephen Rothwell
2012-03-08  5:51 ` Stephen Rothwell
2012-03-10  9:55 ` Janusz Krzysztofik
2012-03-10  9:55   ` Janusz Krzysztofik

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=20120514185116.fcde1a3be2fbaae3c4b5f279@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=tomi.valkeinen@ti.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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.