From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Delvare Subject: [PATCH] crypto/nx/nx-842: dev_set_drvdata can no longer fail Date: Wed, 28 May 2014 14:02:24 +0200 Message-ID: <20140528140224.3352b072@endymion.delvare> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: linux-crypto@vger.kernel.org, Robert Jennings , Marcelo Henrique Cerri , Fionnuala Gunter , Stephen Rothwell To: Greg Kroah-Hartman Return-path: Received: from cantor2.suse.de ([195.135.220.15]:55561 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745AbaE1MC2 (ORCPT ); Wed, 28 May 2014 08:02:28 -0400 Sender: linux-crypto-owner@vger.kernel.org List-ID: Don't check if dev_set_drvdata() failed, it can't, and it returns void now. Signed-off-by: Jean Delvare Cc: Greg Kroah-Hartman Cc: Robert Jennings Cc: Marcelo Henrique Cerri Cc: Fionnuala Gunter --- 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