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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/char/raw3270.c between commit
b9d3aed7e1e50183085fcd2af643bf42d6b4bd95 ("[S390] more bus_id -> dev_name
conversions") from Linus' tree and commit
1ad49a066d3a1627b7a640117804a1058fc55aa0 ("device create: s390: convert
device_create_drvdata to device_create") from the driver-core tree.

I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/s390/char/raw3270.c
index 1792b2c,abe17d4..0000000
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@@ -1168,19 -1168,17 +1168,17 @@@ static int raw3270_create_attributes(st
  	if (rc)
  		goto out;
  
- 	rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
- 					     MKDEV(IBM_TTY3270_MAJOR, rp->minor),
- 					     NULL,
- 					     "tty%s", dev_name(&rp->cdev->dev));
+ 	rp->clttydev = device_create(class3270, &rp->cdev->dev,
+ 				     MKDEV(IBM_TTY3270_MAJOR, rp->minor), NULL,
 -				     "tty%s", rp->cdev->dev.bus_id);
++				     "tty%s", dev_name(&rp->cdev->dev));
  	if (IS_ERR(rp->clttydev)) {
  		rc = PTR_ERR(rp->clttydev);
  		goto out_ttydev;
  	}
  
- 	rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
- 					     MKDEV(IBM_FS3270_MAJOR, rp->minor),
- 					     NULL,
- 					     "tub%s", dev_name(&rp->cdev->dev));
+ 	rp->cltubdev = device_create(class3270, &rp->cdev->dev,
+ 				     MKDEV(IBM_FS3270_MAJOR, rp->minor), NULL,
 -				     "tub%s", rp->cdev->dev.bus_id);
++				     "tub%s", dev_name(&rp->cdev->dev));
  	if (!IS_ERR(rp->cltubdev))
  		goto out;

Attachment: pgpkkYm6kFgWK.pgp
Description: PGP signature