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/net/claw.c between commit
b9d3aed7e1e50183085fcd2af643bf42d6b4bd95 ("[S390] more bus_id -> dev_name
conversions") from Linus' tree and commit
9ea9c3769253947978746fab5cab5df10bc1ee35 ("Driver core: Use
dev_get_drvdata() accessors") 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/net/claw.c
index 8f83fc9,328a521..0000000
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@@ -581,10 -581,10 +581,10 @@@ claw_irq_handler(struct ccw_device *cde
  
  	CLAW_DBF_TEXT(4, trace, "clawirq");
          /* Bypass all 'unsolicited interrupts' */
- 	if (!cdev->dev.driver_data) {
+ 	if (!dev_get_drvdata(&cdev->dev)) {
                  printk(KERN_WARNING "claw: unsolicited interrupt for device:"
  		 	"%s received c-%02x d-%02x\n",
 -		       cdev->dev.bus_id, irb->scsw.cmd.cstat,
 +		       dev_name(&cdev->dev), irb->scsw.cmd.cstat,
  		       irb->scsw.cmd.dstat);
  		CLAW_DBF_TEXT(2, trace, "badirq");
                  return;
@@@ -2880,10 -2879,9 +2880,10 @@@ claw_new_device(struct ccwgroup_device 
  	int ret;
  	struct ccw_dev_id dev_id;
  
 -	printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id);
 +	printk(KERN_INFO "claw: add for %s\n",
 +	       dev_name(&cgdev->cdev[READ]->dev));
  	CLAW_DBF_TEXT(2, setup, "new_dev");
- 	privptr = cgdev->dev.driver_data;
+ 	privptr = dev_get_drvdata(&cgdev->dev);
  	cgdev->cdev[READ]->dev.driver_data = privptr;
  	cgdev->cdev[WRITE]->dev.driver_data = privptr;
  	if (!privptr)
@@@ -2990,8 -2986,8 +2990,8 @@@ claw_shutdown_device(struct ccwgroup_de
  	struct net_device *ndev;
  	int	ret;
  
 -	CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
 +	CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
- 	priv = cgdev->dev.driver_data;
+ 	priv = dev_get_drvdata(&cgdev->dev);
  	if (!priv)
  		return -ENODEV;
  	ndev = priv->channel[READ].ndev;
@@@ -3020,11 -3016,11 +3020,11 @@@ claw_remove_device(struct ccwgroup_devi
  	struct claw_privbk *priv;
  
  	BUG_ON(!cgdev);
 -	CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
 +	CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
- 	priv = cgdev->dev.driver_data;
+ 	priv = dev_get_drvdata(&cgdev->dev);
  	BUG_ON(!priv);
  	printk(KERN_INFO "claw: %s() called %s will be removed.\n",
 -			__func__,cgdev->cdev[0]->dev.bus_id);
 +			__func__, dev_name(&cgdev->cdev[0]->dev));
  	if (cgdev->state == CCWGROUP_ONLINE)
  		claw_shutdown_device(cgdev);
  	claw_remove_files(&cgdev->dev);

Attachment: pgpc8gS4zWubK.pgp
Description: PGP signature