Commit c6c6c69d authored by Jan Höppner's avatar Jan Höppner Committed by Jens Axboe
Browse files

s390/dasd: Remove PRINTK_HEADER and KMSG_COMPONENT definitions 



PRINTK_HEADER was mainly used to prefix log messages with the module
name. Most components don't use this definition anymore. Either because
there are no log messages being generated anymore, or pr_*() were
replaced by dev_*(), which contains device and component information
already.

PRINTK_HEADER is also dropped in the function
dasd_3990_erp_handle_match_erp() in dasd_3990_erp.c from a panic() call
as panic() already provides all relevant information.

KMSG_COMPONENT was mainly used to identify a component in a long gone
kernel message catalog feature.

Remove both definition since they're either not used or alternatives
make the code slightly shorter and more readable.

Signed-off-by: default avatarJan Höppner <hoeppner@linux.ibm.com>
Reviewed-by: default avatarStefan Haberland <sth@linux.ibm.com>
Signed-off-by: default avatarStefan Haberland <sth@linux.ibm.com>
Link: https://lore.kernel.org/r/20240208164248.540985-9-sth@linux.ibm.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4ba6366d

drivers/s390/block/dasd.c

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 
#include <asm/itcw.h>

#include <asm/diag.h>



/* This is ugly... */

#define PRINTK_HEADER "dasd:"



#include "dasd_int.h"

/*

 * SECTION: Constant definitions to be used within this file

drivers/s390/block/dasd_3990_erp.c

+1 −6
Original line number Diff line number Diff line
@@ -7,13 +7,9 @@ 
 *

 */



#define KMSG_COMPONENT "dasd-eckd"



#include <linux/timer.h>

#include <asm/idals.h>



#define PRINTK_HEADER "dasd_erp(3990): "



#include "dasd_int.h"

#include "dasd_eckd.h"
@@ -2700,8 +2696,7 @@ dasd_3990_erp_handle_match_erp(struct dasd_ccw_req *erp_head, 
	while (erp_done != erp) {



		if (erp_done == NULL)	/* end of chain reached */

			panic(PRINTK_HEADER "Programming error in ERP! The "

			      "original request was lost\n");

			panic("Programming error in ERP! The original request was lost\n");



		/* remove the request from the device queue */

		list_del(&erp_done->blocklist);

drivers/s390/block/dasd_alias.c

+0 −8
Original line number Diff line number Diff line
@@ -6,20 +6,12 @@ 
 * Author(s): Stefan Weinhuber <wein@de.ibm.com>

 */



#define KMSG_COMPONENT "dasd-eckd"



#include <linux/list.h>

#include <linux/slab.h>

#include <asm/ebcdic.h>

#include "dasd_int.h"

#include "dasd_eckd.h"



#ifdef PRINTK_HEADER

#undef PRINTK_HEADER

#endif				/* PRINTK_HEADER */

#define PRINTK_HEADER "dasd(eckd):"





/*

 * General concept of alias management:

 * - PAV and DASD alias management is specific to the eckd discipline.

drivers/s390/block/dasd_devmap.c

+0 −4
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 *

 */



#define KMSG_COMPONENT "dasd"



#include <linux/ctype.h>

#include <linux/init.h>

#include <linux/module.h>
@@ -24,8 +22,6 @@ 
#include <linux/uaccess.h>

#include <asm/ipl.h>



/* This is ugly... */

#define PRINTK_HEADER "dasd_devmap:"

#define DASD_MAX_PARAMS 256



#include "dasd_int.h"

drivers/s390/block/dasd_diag.c

+0 −4
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
 *

 */



#define KMSG_COMPONENT "dasd"



#include <linux/kernel_stat.h>

#include <linux/stddef.h>

#include <linux/kernel.h>
@@ -31,8 +29,6 @@ 
#include "dasd_int.h"

#include "dasd_diag.h"



#define PRINTK_HEADER "dasd(diag):"



MODULE_LICENSE("GPL");



/* The maximum number of blocks per request (max_blocks) is dependent on the