Skip to content

Commit c3d1746

Browse files
committed
s390: Remove KMSG_COMPONENT macro
The KMSG_COMPONENT macro is a leftover of the s390 specific "kernel message catalog" which never made it upstream. Remove the macro in order to get rid of a pointless indirection. Replace all users with the string it defines. In almost all cases this leads to a simple replacement like this: - #define KMSG_COMPONENT "appldata" - #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #define pr_fmt(fmt) "appldata: " fmt Except for some special cases this is just mechanical/scripted work. Acked-by: Thomas Richter <tmricht@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent e950d1f commit c3d1746

117 files changed

Lines changed: 121 additions & 238 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

arch/s390/appldata/appldata_base.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
* Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
1010
*/
1111

12-
#define KMSG_COMPONENT "appldata"
13-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
12+
#define pr_fmt(fmt) "appldata: " fmt
1413

1514
#include <linux/export.h>
1615
#include <linux/module.h>

arch/s390/appldata/appldata_os.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
* Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
99
*/
1010

11-
#define KMSG_COMPONENT "appldata"
12-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
11+
#define pr_fmt(fmt) "appldata: " fmt
1312

1413
#include <linux/module.h>
1514
#include <linux/init.h>

arch/s390/crypto/aes_s390.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
* Derived from "crypto/aes_generic.c"
1515
*/
1616

17-
#define KMSG_COMPONENT "aes_s390"
18-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
17+
#define pr_fmt(fmt) "aes_s390: " fmt
1918

2019
#include <crypto/aes.h>
2120
#include <crypto/algapi.h>

arch/s390/crypto/hmac_s390.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* s390 specific HMAC support.
66
*/
77

8-
#define KMSG_COMPONENT "hmac_s390"
9-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
8+
#define pr_fmt(fmt) "hmac_s390: " fmt
109

1110
#include <asm/cpacf.h>
1211
#include <crypto/internal/hash.h>

arch/s390/crypto/paes_s390.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
* Harald Freudenberger <freude@de.ibm.com>
1111
*/
1212

13-
#define KMSG_COMPONENT "paes_s390"
14-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
13+
#define pr_fmt(fmt) "paes_s390: " fmt
1514

1615
#include <linux/atomic.h>
1716
#include <linux/cpufeature.h>

arch/s390/crypto/phmac_s390.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* s390 specific HMAC support for protected keys.
66
*/
77

8-
#define KMSG_COMPONENT "phmac_s390"
9-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
8+
#define pr_fmt(fmt) "phmac_s390: " fmt
109

1110
#include <asm/cpacf.h>
1211
#include <asm/pkey.h>

arch/s390/crypto/prng.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
* Driver for the s390 pseudo random number generator
77
*/
88

9-
#define KMSG_COMPONENT "prng"
10-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
9+
#define pr_fmt(fmt) "prng: " fmt
1110

1211
#include <linux/fs.h>
1312
#include <linux/fips.h>

arch/s390/hypfs/hypfs_diag.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
* Author(s): Michael Holzheu <holzheu@de.ibm.com>
88
*/
99

10-
#define KMSG_COMPONENT "hypfs"
11-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
10+
#define pr_fmt(fmt) "hypfs: " fmt
1211

1312
#include <linux/types.h>
1413
#include <linux/errno.h>

arch/s390/hypfs/hypfs_diag_fs.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
* Author(s): Michael Holzheu <holzheu@de.ibm.com>
88
*/
99

10-
#define KMSG_COMPONENT "hypfs"
11-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
10+
#define pr_fmt(fmt) "hypfs: " fmt
1211

1312
#include <linux/types.h>
1413
#include <linux/errno.h>

arch/s390/hypfs/inode.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
* Author(s): Michael Holzheu <holzheu@de.ibm.com>
77
*/
88

9-
#define KMSG_COMPONENT "hypfs"
10-
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
9+
#define pr_fmt(fmt) "hypfs: " fmt
1110

1211
#include <linux/types.h>
1312
#include <linux/errno.h>

0 commit comments

Comments
 (0)