2 files changed, 2 insertions, 5 deletions

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index b9e59bc9435a..2c785148d21e 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -1063,7 +1063,6 @@ int __init zcrypt_api_init(void)
                 rc = -ENOMEM;
                 goto out_misc;
         }
-        zcrypt_entry->nlink = 1;
         zcrypt_entry->data = NULL;
         zcrypt_entry->read_proc = zcrypt_status_read;
         zcrypt_entry->write_proc = zcrypt_status_write;
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index b97dd15bdb9a..ecca1046714e 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1511,8 +1511,7 @@ lcs_txbuffer_cb(struct lcs_channel *channel, struct lcs_buffer *buffer)
         LCS_DBF_TEXT(5, trace, "txbuffcb");
         /* Put buffer back to pool. */
         lcs_release_buffer(channel, buffer);
-        card = (struct lcs_card *)
-                ((char *) channel - offsetof(struct lcs_card, write));
+        card = container_of(channel, struct lcs_card, write);
         if (netif_queue_stopped(card->dev) && netif_carrier_ok(card->dev))
                 netif_wake_queue(card->dev);
         spin_lock(&card->lock);
@@ -1810,8 +1809,7 @@ lcs_get_frames_cb(struct lcs_channel *channel, struct lcs_buffer *buffer)
                 LCS_DBF_TEXT(4, trace, "-eiogpkt");
                 return;
         }
-        card = (struct lcs_card *)
-                ((char *) channel - offsetof(struct lcs_card, read));
+        card = container_of(channel, struct lcs_card, read);
         offset = 0;
         while (lcs_hdr->offset != 0) {
                 if (lcs_hdr->offset <= 0 ||