summaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/qeth_core_sys.c
diff options
context:
space:
mode:
authorJulian Wiedmann2017-10-18 17:40:15 +0200
committerDavid S. Miller2017-10-20 14:11:04 +0200
commited2e93efc3b8d34ba36b0f7b581f3828916a1da7 (patch)
tree71de41dc83593fadaa1eaaf0ed65241e09052d2f /drivers/s390/net/qeth_core_sys.c
parents390/drivers: use setup_timer (diff)
downloadkernel-qcow2-linux-ed2e93efc3b8d34ba36b0f7b581f3828916a1da7.tar.gz
kernel-qcow2-linux-ed2e93efc3b8d34ba36b0f7b581f3828916a1da7.tar.xz
kernel-qcow2-linux-ed2e93efc3b8d34ba36b0f7b581f3828916a1da7.zip
s390/qeth: remove duplicated device matching
With commit "s390/ccwgroup: tie a ccwgroup driver to its ccw driver", the ccwgroup core now ensures that a qeth group device only consists of ccw devices which are supported by qeth. Therefore remove qeth's internal device matching, and use .driver_info to determine the card type. Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core_sys.c')
-rw-r--r--drivers/s390/net/qeth_core_sys.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index d1ee9e30c68b..b22ed2a57acd 100644
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -475,10 +475,8 @@ static ssize_t qeth_dev_isolation_store(struct device *dev,
return -EINVAL;
mutex_lock(&card->conf_mutex);
- /* check for unknown, too, in case we do not yet know who we are */
if (card->info.type != QETH_CARD_TYPE_OSD &&
- card->info.type != QETH_CARD_TYPE_OSX &&
- card->info.type != QETH_CARD_TYPE_UNKNOWN) {
+ card->info.type != QETH_CARD_TYPE_OSX) {
rc = -EOPNOTSUPP;
dev_err(&card->gdev->dev, "Adapter does not "
"support QDIO data connection isolation\n");