linux-next: manual merge of the driver-core tree with the sh tree

linux-next: manual merge of the driver-core tree with the sh tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/sh/maple/maple.c between commit
b233b28eac0cc37d07c2d007ea08c86c778c5af4 ("sh: maple: Support block reads
and writes") from the sh tree and commit
f1f93f5605f08a698418e52828bef46973b6a4ec ("sh: struct device - replace
bus_id with dev_name(), dev_set_name()") from the driver-core tree.

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

Maybe we could persuade Paul to apply the driver-core patch (not the
patch below)to the sh tree (assuming he has been sent a copy)?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/sh/maple/maple.c
index 4054fe9,7e1257a..0000000
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@@ -367,10 -423,12 +367,10 @@@ static void maple_attach_driver(struct 
  	if (function > 0x200) {
  		/* Do this silently - as not a real device */
  		function = 0;
 -		mdev->driver = &maple_dummy_driver;
 +		mdev->driver = &maple_unsupported_device;
- 		sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
+ 		dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
 +
  	} else {
 -		printk(KERN_INFO
 -			"Maple bus at (%d, %d): Function 0x%lX\n",
 -			mdev->port, mdev->unit, function);
  
  		matched =
  			bus_for_each_drv(&maple_bus_type, NULL, mdev,
@@@ -378,22 -436,21 +378,22 @@@
  
  		if (matched == 0) {
  			/* Driver does not exist yet */
 -			printk(KERN_INFO
 -				"No maple driver found.\n");
 -			mdev->driver = &maple_dummy_driver;
 +			dev_info(&mdev->dev, "no driver found\n");
 +			mdev->driver = &maple_unsupported_device;
  		}
- 		sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,
- 			mdev->unit, function);
+ 		dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
+ 			     mdev->unit, function);
  	}
 +
  	mdev->function = function;
  	mdev->dev.release = &maple_release_device;
 -	retval = device_register(&mdev->dev);
 -	if (retval) {
 -		printk(KERN_INFO
 -		"Maple bus: Attempt to register device"
 -		" (%x, %x) failed.\n",
 -		mdev->port, mdev->unit);
 +
 +	atomic_set(&mdev->busy, 0);
 +	error = device_register(&mdev->dev);
 +	if (error) {
 +		dev_warn(&mdev->dev, "could not register device at"
 +			" (%d, %d), with error 0x%X\n", mdev->unit,
 +			mdev->port, error);
  		maple_free_dev(mdev);
  		mdev = NULL;
  		return;

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

[Greg KH]

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

On Tue, Mar 03, 2009 at 10:45:33AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/sh/maple/maple.c between commit
> b233b28eac0cc37d07c2d007ea08c86c778c5af4 ("sh: maple: Support block reads
> and writes") from the sh tree and commit
> f1f93f5605f08a698418e52828bef46973b6a4ec ("sh: struct device - replace
> bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
> 
> Maybe we could persuade Paul to apply the driver-core patch (not the
> patch below)to the sh tree (assuming he has been sent a copy)?

I think he was sent a copy, Kay?

Anyway, Paul, here's the patch, could you take this through your tree to
prevent future conflicts?  It should build and work today, no
dependancies on any other patch

thanks,

greg k-h

[-- Attachment #2: bus_id-sh.patch --]
[-- Type: text/plain, Size: 1976 bytes --]

From: Kay Sievers <kay.sievers@vrfy.org>
Subject: sh: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
---
 drivers/sh/maple/maple.c           |    8 ++++----
 drivers/sh/superhyway/superhyway.c |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -424,7 +424,7 @@ static void maple_attach_driver(struct m
 		/* Do this silently - as not a real device */
 		function = 0;
 		mdev->driver = &maple_dummy_driver;
-		sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
+		dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
 	} else {
 		printk(KERN_INFO
 			"Maple bus at (%d, %d): Function 0x%lX\n",
@@ -440,8 +440,8 @@ static void maple_attach_driver(struct m
 				"No maple driver found.\n");
 			mdev->driver = &maple_dummy_driver;
 		}
-		sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,
-			mdev->unit, function);
+		dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
+			     mdev->unit, function);
 	}
 	mdev->function = function;
 	mdev->dev.release = &maple_release_device;
@@ -780,7 +780,7 @@ struct bus_type maple_bus_type = {
 EXPORT_SYMBOL_GPL(maple_bus_type);
 
 static struct device maple_bus = {
-	.bus_id = "maple",
+	.init_name = "maple",
 	.release = maple_bus_release,
 };
 
--- a/drivers/sh/superhyway/superhyway.c
+++ b/drivers/sh/superhyway/superhyway.c
@@ -22,7 +22,7 @@
 static int superhyway_devices;
 
 static struct device superhyway_bus_device = {
-	.bus_id = "superhyway",
+	.init_name = "superhyway",
 };
 
 static void superhyway_device_release(struct device *dev)
@@ -83,7 +83,7 @@ int superhyway_add_device(unsigned long
 	dev->id.id		= dev->vcr.mod_id;
 
 	sprintf(dev->name, "SuperHyway device %04x", dev->id.id);
-	sprintf(dev->dev.bus_id, "%02x", superhyway_devices);
+	dev_set_name(&dev->dev, "%02x", superhyway_devices);
 
 	superhyway_devices++;
 

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

[Paul Mundt]

On Mon, Mar 02, 2009 at 03:59:26PM -0800, Greg KH wrote:
> On Tue, Mar 03, 2009 at 10:45:33AM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/sh/maple/maple.c between commit
> > b233b28eac0cc37d07c2d007ea08c86c778c5af4 ("sh: maple: Support block reads
> > and writes") from the sh tree and commit
> > f1f93f5605f08a698418e52828bef46973b6a4ec ("sh: struct device - replace
> > bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> > 
> > Maybe we could persuade Paul to apply the driver-core patch (not the
> > patch below)to the sh tree (assuming he has been sent a copy)?
> 
> I think he was sent a copy, Kay?
> 
> Anyway, Paul, here's the patch, could you take this through your tree to
> prevent future conflicts?  It should build and work today, no
> dependancies on any other patch
> 
I'm a bit behind on pending patches due to travel, so it's possible I
just missed the earlier iteration. In any event, I've queued this up now,
thanks!

linux-next: manual merge of the driver-core tree with the sh tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/platform.c between commit
bd05086bbe3f241cd552068f9ceba9e19c6ce427 ("driver core: Convert to
kasprintf() for early dev_name()") from the sh tree and commit
d08bd4bf3c0d8ea211eae36ab849787d67cb35e4 ("driver core: Early dev_name()
support") from the driver-core tree (which is also in the sh tree).

I used the version from the sh tree.  Paul, you should submit that patch
to Greg (if you haven't already).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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