leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/zcrypt: remove gratuitious NULL check in .remove() callbacks

Browse Source 
As .remove() is only called after a successful .probe() call, we can
trust that the drvdata is valid.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
This commit is contained in:
Julian Wiedmann 2021-06-07 11:18:45 +02:00 committed by Heiko Carstens
parent b5adbbf896
commit c42257d640
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/s390/crypto/zcrypt_cex2a.c
View File

@ -132,8 +132,7 @@ static void zcrypt_cex2a_card_remove(struct ap_device *ap_dev)
{ {
struct zcrypt_card *zc = dev_get_drvdata(&ap_dev->device); struct zcrypt_card *zc = dev_get_drvdata(&ap_dev->device);
if (zc) zcrypt_card_unregister(zc);
zcrypt_card_unregister(zc);
} }
static struct ap_driver zcrypt_cex2a_card_driver = { static struct ap_driver zcrypt_cex2a_card_driver = {
@ -192,8 +191,7 @@ static void zcrypt_cex2a_queue_remove(struct ap_device *ap_dev)
{ {
struct zcrypt_queue *zq = dev_get_drvdata(&ap_dev->device); struct zcrypt_queue *zq = dev_get_drvdata(&ap_dev->device);
if (zq) zcrypt_queue_unregister(zq);
zcrypt_queue_unregister(zq);
} }
static struct ap_driver zcrypt_cex2a_queue_driver = { static struct ap_driver zcrypt_cex2a_queue_driver = {

8
drivers/s390/crypto/zcrypt_cex2c.c
View File

@ -314,8 +314,8 @@ static void zcrypt_cex2c_card_remove(struct ap_device *ap_dev)
if (ap_test_bit(&ac->functions, AP_FUNC_COPRO)) if (ap_test_bit(&ac->functions, AP_FUNC_COPRO))
sysfs_remove_group(&ap_dev->device.kobj, &cca_card_attr_grp); sysfs_remove_group(&ap_dev->device.kobj, &cca_card_attr_grp);
if (zc)
zcrypt_card_unregister(zc); zcrypt_card_unregister(zc);
} }
static struct ap_driver zcrypt_cex2c_card_driver = { static struct ap_driver zcrypt_cex2c_card_driver = {
@ -387,8 +387,8 @@ static void zcrypt_cex2c_queue_remove(struct ap_device *ap_dev)
if (ap_test_bit(&aq->card->functions, AP_FUNC_COPRO)) if (ap_test_bit(&aq->card->functions, AP_FUNC_COPRO))
sysfs_remove_group(&ap_dev->device.kobj, &cca_queue_attr_grp); sysfs_remove_group(&ap_dev->device.kobj, &cca_queue_attr_grp);
if (zq)
zcrypt_queue_unregister(zq); zcrypt_queue_unregister(zq);
} }
static struct ap_driver zcrypt_cex2c_queue_driver = { static struct ap_driver zcrypt_cex2c_queue_driver = {

8
drivers/s390/crypto/zcrypt_cex4.c
View File

@ -575,8 +575,8 @@ static void zcrypt_cex4_card_remove(struct ap_device *ap_dev)
sysfs_remove_group(&ap_dev->device.kobj, &cca_card_attr_grp); sysfs_remove_group(&ap_dev->device.kobj, &cca_card_attr_grp);
else if (ap_test_bit(&ac->functions, AP_FUNC_EP11)) else if (ap_test_bit(&ac->functions, AP_FUNC_EP11))
sysfs_remove_group(&ap_dev->device.kobj, &ep11_card_attr_grp); sysfs_remove_group(&ap_dev->device.kobj, &ep11_card_attr_grp);
if (zc)
zcrypt_card_unregister(zc); zcrypt_card_unregister(zc);
} }
static struct ap_driver zcrypt_cex4_card_driver = { static struct ap_driver zcrypt_cex4_card_driver = {
@ -665,8 +665,8 @@ static void zcrypt_cex4_queue_remove(struct ap_device *ap_dev)
sysfs_remove_group(&ap_dev->device.kobj, &cca_queue_attr_grp); sysfs_remove_group(&ap_dev->device.kobj, &cca_queue_attr_grp);
else if (ap_test_bit(&aq->card->functions, AP_FUNC_EP11)) else if (ap_test_bit(&aq->card->functions, AP_FUNC_EP11))
sysfs_remove_group(&ap_dev->device.kobj, &ep11_queue_attr_grp); sysfs_remove_group(&ap_dev->device.kobj, &ep11_queue_attr_grp);
if (zq)
zcrypt_queue_unregister(zq); zcrypt_queue_unregister(zq);
} }
static struct ap_driver zcrypt_cex4_queue_driver = { static struct ap_driver zcrypt_cex4_queue_driver = {