linux-kernel - linux-next: manual merge of the tty tree with the sh tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130805150456.974461a9896ae4d61f044aab@canb.auug.org.au>
Date:	Mon, 5 Aug 2013 15:04:56 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bastian Hecht <hechtb@...il.com>,
	Jingoo Han <jg1.han@...sung.com>,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the tty tree with the sh tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/sh-sci.c between commit ada80ee7fa60 ("serial: sh-sci:
Add OF support") from the sh tree and commit 3ba35baa55fa ("serial:
sh-sci: use dev_get_platdata()") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/tty/serial/sh-sci.c
index 5ef9300,5377502..0000000
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@@ -2588,20 -2481,9 +2588,20 @@@ static int sci_probe(struct platform_de
  	if (is_early_platform_device(dev))
  		return sci_probe_earlyprintk(dev);
  
 +	if (dev->dev.of_node)
 +		p = sci_parse_dt(dev, &dev_id);
 +	else
- 		p = dev->dev.platform_data;
++		p = dev_get_platdata(&dev->dev);
 +
 +	if (!p) {
 +		dev_err(&dev->dev, "no setup data supplied\n");
 +		return -EINVAL;
 +	}
 +
 +	sp = &sci_ports[dev_id];
  	platform_set_drvdata(dev, sp);
  
 -	ret = sci_probe_single(dev, dev->id, p, sp);
 +	ret = sci_probe_single(dev, dev_id, p, sp);
  	if (ret)
  		return ret;
  

Content of type "application/pgp-signature" skipped