Merge tag 'gpio-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[cascardo/linux.git] / drivers / s390 / cio / chsc.c

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 4fe9531..940e725 100644 (file)
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -940,7 +940,6 @@ EXPORT_SYMBOL_GPL(chsc_determine_channel_path_desc);
 int chsc_determine_base_channel_path_desc(struct chp_id chpid,
                                          struct channel_path_desc *desc)
 {
-       struct chsc_response_struct *chsc_resp;
        struct chsc_scpd *scpd_area;
        unsigned long flags;
        int ret;
@@ -950,8 +949,8 @@ int chsc_determine_base_channel_path_desc(struct chp_id chpid,
        ret = chsc_determine_channel_path_desc(chpid, 0, 0, 0, 0, scpd_area);
        if (ret)
                goto out;
-       chsc_resp = (void *)&scpd_area->response;
-       memcpy(desc, &chsc_resp->data, sizeof(*desc));
+
+       memcpy(desc, scpd_area->data, sizeof(*desc));
 out:
        spin_unlock_irqrestore(&chsc_page_lock, flags);
        return ret;
@@ -960,7 +959,6 @@ out:
 int chsc_determine_fmt1_channel_path_desc(struct chp_id chpid,
                                          struct channel_path_desc_fmt1 *desc)
 {
-       struct chsc_response_struct *chsc_resp;
        struct chsc_scpd *scpd_area;
        unsigned long flags;
        int ret;
@@ -970,8 +968,8 @@ int chsc_determine_fmt1_channel_path_desc(struct chp_id chpid,
        ret = chsc_determine_channel_path_desc(chpid, 0, 1, 1, 0, scpd_area);
        if (ret)
                goto out;
-       chsc_resp = (void *)&scpd_area->response;
-       memcpy(desc, &chsc_resp->data, sizeof(*desc));
+
+       memcpy(desc, scpd_area->data, sizeof(*desc));
 out:
        spin_unlock_irqrestore(&chsc_page_lock, flags);
        return ret;