[PATCH] crypto/nx/nx-842: dev_set_drvdata can no longer fail

* [PATCH] crypto/nx/nx-842: dev_set_drvdata can no longer fail
@ 2014-05-28 12:02 Jean Delvare
  2014-05-28 20:39 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2014-05-28 12:02 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: linux-crypto, Robert Jennings, Marcelo Henrique Cerri,
	Fionnuala Gunter, Stephen Rothwell

Don't check if dev_set_drvdata() failed, it can't, and it returns void
now.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Cc: Marcelo Henrique Cerri <mhcerri@linux.vnet.ibm.com>
Cc: Fionnuala Gunter <fin@linux.vnet.ibm.com>
---
I believe this should go through Greg's driver-core tree, as this is
where the rest of the dev_set_drvdata() changes are.

 drivers/crypto/nx/nx-842.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

--- a/drivers/crypto/nx/nx-842.c
+++ b/drivers/crypto/nx/nx-842.c
@@ -1197,12 +1197,7 @@ static int __init nx842_probe(struct vio
 	}
 
 	rcu_read_lock();
-	if (dev_set_drvdata(&viodev->dev, rcu_dereference(devdata))) {
-		rcu_read_unlock();
-		dev_err(&viodev->dev, "failed to set driver data for device\n");
-		ret = -1;
-		goto error;
-	}
+	dev_set_drvdata(&viodev->dev, rcu_dereference(devdata));
 	rcu_read_unlock();
 
 	if (sysfs_create_group(&viodev->dev.kobj, &nx842_attribute_group)) {


-- 
Jean Delvare
SUSE L3 Support

^ permalink raw reply	[flat|nested] 3+ messages in thread