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

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

[Stephen Rothwell]

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

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

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

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

[Greg KH]

On Mon, Aug 05, 2013 at 03:04:56PM +1000, Stephen Rothwell wrote:
> 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).

Looks good to me, thanks.

greg k-h