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

s390/dasd: Use dev_*() for device log messages 



All log messages in dasd.c use the printk variants of pr_*(). They all
add the name of the affected device manually to the log message.
This can be simplified by using the dev_*() variants of printk, which
include the device information and make a separate call to dev_name()
unnecessary.

The KMSG_COMPONENT and the pr_fmt() definition can be dropped. Note that
this removes the "dasd: " prefix from the one pr_info() call in
dasd_init(). However, the log message already provides all relevant
information.

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-10-sth@linux.ibm.com


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

drivers/s390/block/dasd.c

+24 −26
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
 * Copyright IBM Corp. 1999, 2009

 */



#define KMSG_COMPONENT "dasd"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/kmod.h>

#include <linux/init.h>

#include <linux/interrupt.h>
@@ -3381,8 +3378,7 @@ static void dasd_generic_auto_online(void *data, async_cookie_t cookie) 


	ret = ccw_device_set_online(cdev);

	if (ret)

		pr_warn("%s: Setting the DASD online failed with rc=%d\n",

			dev_name(&cdev->dev), ret);

		dev_warn(&cdev->dev, "Setting the DASD online failed with rc=%d\n", ret);

}



/*
@@ -3469,8 +3465,11 @@ int dasd_generic_set_online(struct ccw_device *cdev, 
{

	struct dasd_discipline *discipline;

	struct dasd_device *device;

	struct device *dev;

	int rc;



	dev = &cdev->dev;



	/* first online clears initial online feature flag */

	dasd_set_feature(cdev, DASD_FEATURE_INITIAL_ONLINE, 0);

	device = dasd_create_device(cdev);
@@ -3483,11 +3482,10 @@ int dasd_generic_set_online(struct ccw_device *cdev, 
			/* Try to load the required module. */

			rc = request_module(DASD_DIAG_MOD);

			if (rc) {

				pr_warn("%s Setting the DASD online failed "

				dev_warn(dev, "Setting the DASD online failed "

					 "because the required module %s "

					 "could not be loaded (rc=%d)\n",

					dev_name(&cdev->dev), DASD_DIAG_MOD,

					rc);

					 DASD_DIAG_MOD, rc);

				dasd_delete_device(device);

				return -ENODEV;

			}
@@ -3495,8 +3493,7 @@ int dasd_generic_set_online(struct ccw_device *cdev, 
		/* Module init could have failed, so check again here after

		 * request_module(). */

		if (!dasd_diag_discipline_pointer) {

			pr_warn("%s Setting the DASD online failed because of missing DIAG discipline\n",

				dev_name(&cdev->dev));

			dev_warn(dev, "Setting the DASD online failed because of missing DIAG discipline\n");

			dasd_delete_device(device);

			return -ENODEV;

		}
@@ -3517,8 +3514,8 @@ int dasd_generic_set_online(struct ccw_device *cdev, 
	/* check_device will allocate block device if necessary */

	rc = discipline->check_device(device);

	if (rc) {

		pr_warn("%s Setting the DASD online with discipline %s failed with rc=%i\n",

			dev_name(&cdev->dev), discipline->name, rc);

		dev_warn(dev, "Setting the DASD online with discipline %s failed with rc=%i\n",

			 discipline->name, rc);

		module_put(discipline->owner);

		module_put(base_discipline->owner);

		dasd_delete_device(device);
@@ -3527,16 +3524,15 @@ int dasd_generic_set_online(struct ccw_device *cdev, 


	dasd_set_target_state(device, DASD_STATE_ONLINE);

	if (device->state <= DASD_STATE_KNOWN) {

		pr_warn("%s Setting the DASD online failed because of a missing discipline\n",

			dev_name(&cdev->dev));

		dev_warn(dev, "Setting the DASD online failed because of a missing discipline\n");

		rc = -ENODEV;

		dasd_set_target_state(device, DASD_STATE_NEW);

		if (device->block)

			dasd_free_block(device->block);

		dasd_delete_device(device);

	} else

		pr_debug("dasd_generic device %s found\n",

				dev_name(&cdev->dev));

	} else {

		dev_dbg(dev, "dasd_generic device found\n");

	}



	wait_event(dasd_init_waitq, _wait_for_device(device));
@@ -3547,10 +3543,13 @@ EXPORT_SYMBOL_GPL(dasd_generic_set_online); 


int dasd_generic_set_offline(struct ccw_device *cdev)

{

	int max_count, open_count, rc;

	struct dasd_device *device;

	struct dasd_block *block;

	int max_count, open_count, rc;

	unsigned long flags;

	struct device *dev;



	dev = &cdev->dev;



	rc = 0;

	spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
@@ -3571,11 +3570,10 @@ int dasd_generic_set_offline(struct ccw_device *cdev) 
		open_count = atomic_read(&device->block->open_count);

		if (open_count > max_count) {

			if (open_count > 0)

				pr_warn("%s: The DASD cannot be set offline with open count %i\n",

					dev_name(&cdev->dev), open_count);

				dev_warn(dev, "The DASD cannot be set offline with open count %i\n",

					 open_count);

			else

				pr_warn("%s: The DASD cannot be set offline while it is in use\n",

					dev_name(&cdev->dev));

				dev_warn(dev, "The DASD cannot be set offline while it is in use\n");

			rc = -EBUSY;

			goto out_err;

		}
@@ -3935,8 +3933,8 @@ static int dasd_handle_autoquiesce(struct dasd_device *device, 
	if (dasd_eer_enabled(device))

		dasd_eer_write(device, NULL, DASD_EER_AUTOQUIESCE);



	pr_info("%s: The DASD has been put in the quiesce state\n",

		dev_name(&device->cdev->dev));

	dev_info(&device->cdev->dev,

		 "The DASD has been put in the quiesce state\n");

	dasd_device_set_stop_bits(device, DASD_STOPPED_QUIESCE);



	if (device->features & DASD_FEATURE_REQUEUEQUIESCE)