Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc942cee authored by Joe Perches's avatar Joe Perches Committed by Benjamin Herrenschmidt
Browse files

powerpc/viodasd: Remove VIOD_KERN_<level> macros for printks 



Use #define pr_fmt(fmt) "viod: " fmt
Remove #define VIOD_KERN_WARNING and VIOD_KERN_INFO
Convert printk(VIOD_KERN_<level> to pr_<level>
Coalesce long format strings

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>

 drivers/block/viodasd.c |   86 +++++++++++++++++++---------------------------
 1 files changed, 36 insertions(+), 50 deletions(-)
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1a45dcfe

drivers/block/viodasd.c

+36 −50
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
 * All disk operations are performed by sending messages back and forth to

 * the OS/400 partition.

 */



#define pr_fmt(fmt) "viod: " fmt



#include <linux/major.h>

#include <linux/fs.h>

#include <linux/module.h>
@@ -63,9 +66,6 @@ MODULE_LICENSE("GPL"); 


#define VIOD_VERS		"1.64"



#define VIOD_KERN_WARNING	KERN_WARNING "viod: "

#define VIOD_KERN_INFO		KERN_INFO "viod: "



enum {

	PARTITION_SHIFT = 3,

	MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,
@@ -156,7 +156,7 @@ static int viodasd_open(struct block_device *bdev, fmode_t mode) 
			((u64)DEVICE_NO(d) << 48) | ((u64)flags << 32),

			0, 0, 0);

	if (hvrc != 0) {

		printk(VIOD_KERN_WARNING "HV open failed %d\n", (int)hvrc);

		pr_warning("HV open failed %d\n", (int)hvrc);

		return -EIO;

	}
@@ -167,8 +167,7 @@ static int viodasd_open(struct block_device *bdev, fmode_t mode) 
		const struct vio_error_entry *err =

			vio_lookup_rc(viodasd_err_table, we.sub_result);



		printk(VIOD_KERN_WARNING

				"bad rc opening disk: %d:0x%04x (%s)\n",

		pr_warning("bad rc opening disk: %d:0x%04x (%s)\n",

			   (int)we.rc, we.sub_result, err->msg);

		return -EIO;

	}
@@ -195,8 +194,7 @@ static int viodasd_release(struct gendisk *disk, fmode_t mode) 
			((u64)DEVICE_NO(d) << 48) /* | ((u64)flags << 32) */,

			0, 0, 0);

	if (hvrc != 0)

		printk(VIOD_KERN_WARNING "HV close call failed %d\n",

				(int)hvrc);

		pr_warning("HV close call failed %d\n", (int)hvrc);

	return 0;

}
@@ -288,8 +286,7 @@ static int send_request(struct request *req) 
		bevent = (struct vioblocklpevent *)

			vio_get_event_buffer(viomajorsubtype_blockio);

		if (bevent == NULL) {

			printk(VIOD_KERN_WARNING

			       "error allocating disk event buffer\n");

			pr_warning("error allocating disk event buffer\n");

			goto error_ret;

		}
@@ -333,8 +330,7 @@ static int send_request(struct request *req) 
	}



	if (hvrc != HvLpEvent_Rc_Good) {

		printk(VIOD_KERN_WARNING

		       "error sending disk event to OS/400 (rc %d)\n",

		pr_warning("error sending disk event to OS/400 (rc %d)\n",

			   (int)hvrc);

		goto error_ret;

	}
@@ -402,7 +398,7 @@ static int probe_disk(struct viodasd_device *d) 
			((u64)dev_no << 48) | ((u64)flags<< 32),

			0, 0, 0);

	if (hvrc != 0) {

		printk(VIOD_KERN_WARNING "bad rc on HV open %d\n", (int)hvrc);

		pr_warning("bad rc on HV open %d\n", (int)hvrc);

		return 0;

	}
@@ -416,8 +412,7 @@ static int probe_disk(struct viodasd_device *d) 
		goto retry;

	}

	if (we.max_disk > (MAX_DISKNO - 1)) {

		printk_once(VIOD_KERN_INFO

			"Only examining the first %d of %d disks connected\n",

		printk_once(KERN_INFO pr_fmt("Only examining the first %d of %d disks connected\n"),

			    MAX_DISKNO, we.max_disk + 1);

	}
@@ -432,16 +427,14 @@ static int probe_disk(struct viodasd_device *d) 
			((u64)dev_no << 48) | ((u64)flags << 32),

			0, 0, 0);

	if (hvrc != 0) {

		printk(VIOD_KERN_WARNING

		       "bad rc sending event to OS/400 %d\n", (int)hvrc);

		pr_warning("bad rc sending event to OS/400 %d\n", (int)hvrc);

		return 0;

	}



	if (d->dev == NULL) {

		/* this is when we reprobe for new disks */

		if (vio_create_viodasd(dev_no) == NULL) {

			printk(VIOD_KERN_WARNING

				"cannot allocate virtual device for disk %d\n",

			pr_warning("cannot allocate virtual device for disk %d\n",

				   dev_no);

			return 0;

		}
@@ -457,14 +450,12 @@ static int probe_disk(struct viodasd_device *d) 
	spin_lock_init(&d->q_lock);

	q = blk_init_queue(do_viodasd_request, &d->q_lock);

	if (q == NULL) {

		printk(VIOD_KERN_WARNING "cannot allocate queue for disk %d\n",

				dev_no);

		pr_warning("cannot allocate queue for disk %d\n", dev_no);

		return 0;

	}

	g = alloc_disk(1 << PARTITION_SHIFT);

	if (g == NULL) {

		printk(VIOD_KERN_WARNING

				"cannot allocate disk structure for disk %d\n",

		pr_warning("cannot allocate disk structure for disk %d\n",

			   dev_no);

		blk_cleanup_queue(q);

		return 0;
@@ -489,8 +480,7 @@ static int probe_disk(struct viodasd_device *d) 
	g->driverfs_dev = d->dev;

	set_capacity(g, d->size >> 9);



	printk(VIOD_KERN_INFO "disk %d: %lu sectors (%lu MB) "

			"CHS=%d/%d/%d sector size %d%s\n",

	pr_info("disk %d: %lu sectors (%lu MB) CHS=%d/%d/%d sector size %d%s\n",

		dev_no, (unsigned long)(d->size >> 9),

		(unsigned long)(d->size >> 20),

		(int)d->cylinders, (int)d->tracks,
@@ -580,7 +570,7 @@ static int viodasd_handle_read_write(struct vioblocklpevent *bevent) 
	if (error) {

		const struct vio_error_entry *err;

		err = vio_lookup_rc(viodasd_err_table, bevent->sub_result);

		printk(VIOD_KERN_WARNING "read/write error %d:0x%04x (%s)\n",

		pr_warning("read/write error %d:0x%04x (%s)\n",

			   event->xRc, bevent->sub_result, err->msg);

		num_sect = blk_rq_sectors(req);

	}
@@ -606,8 +596,7 @@ static void handle_block_event(struct HvLpEvent *event) 
		return;

	/* First, we should NEVER get an int here...only acks */

	if (hvlpevent_is_int(event)) {

		printk(VIOD_KERN_WARNING

		       "Yikes! got an int in viodasd event handler!\n");

		pr_warning("Yikes! got an int in viodasd event handler!\n");

		if (hvlpevent_need_ack(event)) {

			event->xRc = HvLpEvent_Rc_InvalidSubtype;

			HvCallEvent_ackLpEvent(event);
@@ -650,7 +639,7 @@ static void handle_block_event(struct HvLpEvent *event) 
		break;



	default:

		printk(VIOD_KERN_WARNING "invalid subtype!");

		pr_warning("invalid subtype!");

		if (hvlpevent_need_ack(event)) {

			event->xRc = HvLpEvent_Rc_InvalidSubtype;

			HvCallEvent_ackLpEvent(event);
@@ -739,19 +728,17 @@ static int __init viodasd_init(void) 
		vio_set_hostlp();



	if (viopath_hostLp == HvLpIndexInvalid) {

		printk(VIOD_KERN_WARNING "invalid hosting partition\n");

		pr_warning("invalid hosting partition\n");

		rc = -EIO;

		goto early_fail;

	}



	printk(VIOD_KERN_INFO "vers " VIOD_VERS ", hosting partition %d\n",

			viopath_hostLp);

	pr_info("vers " VIOD_VERS ", hosting partition %d\n", viopath_hostLp);



        /* register the block device */

	rc =  register_blkdev(VIODASD_MAJOR, VIOD_GENHD_NAME);

	if (rc) {

		printk(VIOD_KERN_WARNING

				"Unable to get major number %d for %s\n",

		pr_warning("Unable to get major number %d for %s\n",

			   VIODASD_MAJOR, VIOD_GENHD_NAME);

		goto early_fail;

	}
@@ -759,8 +746,7 @@ static int __init viodasd_init(void) 
	rc = viopath_open(viopath_hostLp, viomajorsubtype_blockio,

				VIOMAXREQ + 2);

	if (rc) {

		printk(VIOD_KERN_WARNING

		       "error opening path to host partition %d\n",

		pr_warning("error opening path to host partition %d\n",

			   viopath_hostLp);

		goto unregister_blk;

	}
@@ -770,7 +756,7 @@ static int __init viodasd_init(void) 


	rc = vio_register_driver(&viodasd_driver);

	if (rc) {

		printk(VIOD_KERN_WARNING "vio_register_driver failed\n");

		pr_warning("vio_register_driver failed\n");

		goto unset_handler;

	}