2015-06-10 11:01:59

by Vaishali Thakkar

[permalink] [raw]
Subject: [PATCH] s390/zcrypt: Convert use of __constant_cpu_to_le16 to cpu_to_le16

In big endian cases, the macro cpu_to_le16 unfolds to __swab16
which provides special case for constants. In little endian cases,
__constant_cpu_to_le16 and cpu_to_le16 expand directly to the
same expression. So, replace __constant_cpu_to_le16 with
cpu_to_le16 with the goal of getting rid of the definition of
__constant_cpu_to_le16 completely.

The semantic patch that performs this transformation is as follows:

@@expression x;@@

- __constant_cpu_to_le16(x)
+ cpu_to_le16(x)

Signed-off-by: Vaishali Thakkar <[email protected]>
---
drivers/s390/crypto/zcrypt_pcicc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index 4d14c04..9f18876 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -98,11 +98,11 @@ static struct ap_driver zcrypt_pcicc_driver = {
* - VUD block
*/
static struct CPRB static_cprb = {
- .cprb_len = __constant_cpu_to_le16(0x0070),
+ .cprb_len = cpu_to_le16(0x0070),
.cprb_ver_id = 0x41,
.func_id = {0x54,0x32},
.checkpoint_flag= 0x01,
- .svr_namel = __constant_cpu_to_le16(0x0008),
+ .svr_namel = cpu_to_le16(0x0008),
.svr_name = {'I','C','S','F',' ',' ',' ',' '}
};

@@ -164,7 +164,7 @@ static int ICAMEX_msg_to_type6MEX_msg(struct zcrypt_device *zdev,
};
static struct function_and_rules_block static_pke_function_and_rules ={
.function_code = {'P','K'},
- .ulen = __constant_cpu_to_le16(10),
+ .ulen = cpu_to_le16(10),
.only_rule = {'P','K','C','S','-','1','.','2'}
};
struct {
@@ -251,7 +251,7 @@ static int ICACRT_msg_to_type6CRT_msg(struct zcrypt_device *zdev,
};
static struct function_and_rules_block static_pkd_function_and_rules ={
.function_code = {'P','D'},
- .ulen = __constant_cpu_to_le16(10),
+ .ulen = cpu_to_le16(10),
.only_rule = {'P','K','C','S','-','1','.','2'}
};
struct {
--
1.9.1


2015-06-15 13:34:12

by Ingo Tuchscherer

[permalink] [raw]
Subject: Re: [PATCH] s390/zcrypt: Convert use of __constant_cpu_to_le16 to cpu_to_le16


Thanks for bringing up.
I pushed the patch into our internal repository, it will be upstream soon.

Mit freundlichen Gr??en / Kind regards

Ingo Tuchscherer

Software Development - Linux on z Systems
IBM Systems &Technology Group





Phone: +49-7031-16-1986 IBM Deutschland (Embedded
image moved
to file:
pic03543.gif)

E-Mail: [email protected] Schoenaicher Str. 220

71032 Boeblingen

Germany





IBM Deutschland
Research &
Development
GmbH /
Vorsitzender des
Aufsichtsrats:
Martina Koederitz

Gesch?ftsf?hrung:
Dirk Wittkopp
Sitz der
Gesellschaft:
B?blingen /
Registergericht:
Amtsgericht
Stuttgart, HRB
243294






From: Vaishali Thakkar <[email protected]>
To: Ingo Tuchscherer/Germany/IBM@IBMDE
Cc: BOEBLINGEN LINUX390/Germany/IBM@IBMDE,
[email protected], [email protected],
[email protected], [email protected], Julia
Lawall <[email protected]>
Date: 06/10/2015 01:01 PM
Subject: [PATCH] s390/zcrypt: Convert use of __constant_cpu_to_le16 to
cpu_to_le16



In big endian cases, the macro cpu_to_le16 unfolds to __swab16
which provides special case for constants. In little endian cases,
__constant_cpu_to_le16 and cpu_to_le16 expand directly to the
same expression. So, replace __constant_cpu_to_le16 with
cpu_to_le16 with the goal of getting rid of the definition of
__constant_cpu_to_le16 completely.

The semantic patch that performs this transformation is as follows:

@@expression x;@@

- __constant_cpu_to_le16(x)
+ cpu_to_le16(x)

Signed-off-by: Vaishali Thakkar <[email protected]>
---
drivers/s390/crypto/zcrypt_pcicc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/crypto/zcrypt_pcicc.c
b/drivers/s390/crypto/zcrypt_pcicc.c
index 4d14c04..9f18876 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -98,11 +98,11 @@ static struct ap_driver zcrypt_pcicc_driver = {
* - VUD block
*/
static struct CPRB static_cprb = {
- .cprb_len = __constant_cpu_to_le16(0x0070),
+ .cprb_len = cpu_to_le16(0x0070),
.cprb_ver_id = 0x41,
.func_id = {0x54,0x32},
.checkpoint_flag= 0x01,
- .svr_namel = __constant_cpu_to_le16(0x0008),
+ .svr_namel = cpu_to_le16(0x0008),
.svr_name = {'I','C','S','F',' ',' ',' ',' '}
};

@@ -164,7 +164,7 @@ static int ICAMEX_msg_to_type6MEX_msg(struct
zcrypt_device *zdev,
};
static struct function_and_rules_block
static_pke_function_and_rules ={
.function_code = {'P','K'},
- .ulen =
__constant_cpu_to_le16(10),
+ .ulen = cpu_to_le16(10),
.only_rule =
{'P','K','C','S','-','1','.','2'}
};
struct {
@@ -251,7 +251,7 @@ static int ICACRT_msg_to_type6CRT_msg(struct
zcrypt_device *zdev,
};
static struct function_and_rules_block
static_pkd_function_and_rules ={
.function_code = {'P','D'},
- .ulen =
__constant_cpu_to_le16(10),
+ .ulen = cpu_to_le16(10),
.only_rule =
{'P','K','C','S','-','1','.','2'}
};
struct {
--
1.9.1


Attachments:
pic03543.gif (1.81 kB)