hv: Reduce indention in vmbus_on_event

PATCH In review Olaf Hering 2 participants 7 messages Mar 22, 2011 – Apr 12, 2011 Staging

lore

Share & tools

lore

Olaf Hering

author

2011-03-22 21:02 UTC #0 lore raw

PATCH 1/1 hv: Reduce indention in vmbus_on_event

Reduce indention in vmbus_on_event() by converting two if (var) to if (!var)

Signed-off-by Olaf Hering <[email protected]>

---
 drivers/staging/hv/connection.c |   37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

drivers/staging/hv/connection.c +15 ~~-22~~

Index: linux-2.6/drivers/staging/hv/connection.c
===================================================================
@@ -292,32 +292,25 @@ void vmbus_on_event(unsigned long data)
 	u32 *recv_int_page = vmbus_connection.recv_int_page;
 
 	/* Check events */
-	if (recv_int_page) {
-		for (dword = 0; dword < maxdword; dword++) {
-			if (recv_int_page[dword]) {
-				for (bit = 0; bit < 32; bit++) {
-					if (sync_test_and_clear_bit(bit,
-						(unsigned long *)
-						&recv_int_page[dword])) {
-						relid = (dword << 5) + bit;
-						DPRINT_DBG(VMBUS, "event detected for relid - %d", relid);
+	if (!recv_int_page)
+		return;
+	for (dword = 0; dword < maxdword; dword++) {
+		if (!recv_int_page[dword])
+			continue;
+		for (bit = 0; bit < 32; bit++) {
+			if (sync_test_and_clear_bit(bit, (unsigned long *)&recv_int_page[dword])) {
+				relid = (dword << 5) + bit;
+				DPRINT_DBG(VMBUS, "event detected for relid - %d", relid);
 
-						if (relid == 0) {
-							/* special case - vmbus channel protocol msg */
-							DPRINT_DBG(VMBUS, "invalid relid - %d", relid);
-							continue;
-						} else {
-							/* QueueWorkItem(VmbusProcessEvent, (void*)relid); */
-							/* ret = WorkQueueQueueWorkItem(gVmbusConnection.workQueue, VmbusProcessChannelEvent, (void*)relid); */
-						process_chn_event((void *)
-						(unsigned long)relid);
-						}
-					}
+				if (relid == 0) {
+					/* special case - vmbus channel protocol msg */
+					DPRINT_DBG(VMBUS, "invalid relid - %d", relid);
+					continue;
 				}
+				process_chn_event((void *) (unsigned long)relid);
 			}
-		 }
+		}
 	}
-	return;
 }
 
 /*

Olaf Hering

author

2011-03-22 21:06 UTC #1 lore raw

Re: [PATCH] hv: pass u32 to process_chn_event()

Change types in vmbus_on_event() to u32 since the input is u32 as well. Pass u32 to process_chn_event() instead of casting arg to void* and back. Update printk to reflect type change.

Signed-off-by Olaf Hering <[email protected]>

---
compile tested only.

 drivers/staging/hv/connection.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

drivers/staging/hv/connection.c +8 -9

Index: linux-2.6/drivers/staging/hv/connection.c
===================================================================
@@ -255,10 +255,9 @@ struct vmbus_channel *relid2channel(u32
 /*
  * process_chn_event - Process a channel event notification
  */
-static void process_chn_event(void *context)
+static void process_chn_event(u32 relid)
 {
 	struct vmbus_channel *channel;
-	u32 relid = (u32)(unsigned long)context;
 
 	/* ASSERT(relId > 0); */

@@ -276,7 +275,7 @@ static void process_chn_event(void *cont
 		 *			  (void*)channel);
 		 */
 	} else {
-		DPRINT_ERR(VMBUS, "channel not found for relid - %d.", relid);
+		DPRINT_ERR(VMBUS, "channel not found for relid - %u.", relid);
 	}
 }

@@ -285,10 +284,10 @@ static void process_chn_event(void *cont
  */
 void vmbus_on_event(unsigned long data)
 {
-	int dword;
-	int maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5;
+	u32 dword;
+	u32 maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5;
 	int bit;
-	int relid;
+	u32 relid;
 	u32 *recv_int_page = vmbus_connection.recv_int_page;
 
 	/* Check events */

@@ -300,14 +299,14 @@ void vmbus_on_event(unsigned long data)
 		for (bit = 0; bit < 32; bit++) {
 			if (sync_test_and_clear_bit(bit, (unsigned long *)&recv_int_page[dword])) {
 				relid = (dword << 5) + bit;
-				DPRINT_DBG(VMBUS, "event detected for relid - %d", relid);
+				DPRINT_DBG(VMBUS, "event detected for relid - %u", relid);
 
 				if (relid == 0) {
 					/* special case - vmbus channel protocol msg */
-					DPRINT_DBG(VMBUS, "invalid relid - %d", relid);
+					DPRINT_DBG(VMBUS, "invalid relid - %u", relid);
 					continue;
 				}
-				process_chn_event((void *) (unsigned long)relid);
+				process_chn_event(relid);
 			}
 		}
 	}

Olaf Hering

author

2011-03-22 21:08 UTC #2 lore raw

PATCH 1/1 hv: pass integer to tasklet_init()

tasklet_init() takes an integer, so use one right away.

Signed-off-by Olaf Hering <[email protected]>

---
 drivers/staging/hv/vmbus_drv.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

drivers/staging/hv/vmbus_drv.c +2 -4

Index: linux-2.6/drivers/staging/hv/vmbus_drv.c
===================================================================
@@ -454,10 +454,8 @@ static int vmbus_bus_init(void)
 	vmbus_drv_ctx->bus.name = driver_name;
 
 	/* Initialize the bus context */
-	tasklet_init(&vmbus_drv_ctx->msg_dpc, vmbus_on_msg_dpc,
-		     (unsigned long)NULL);
-	tasklet_init(&vmbus_drv_ctx->event_dpc, vmbus_on_event,
-		     (unsigned long)NULL);
+	tasklet_init(&vmbus_drv_ctx->msg_dpc, vmbus_on_msg_dpc, 0);
+	tasklet_init(&vmbus_drv_ctx->event_dpc, vmbus_on_event, 0);
 
 	/* Now, register the bus  with LDM */
 	ret = bus_register(&vmbus_drv_ctx->bus);

Olaf Hering

author

2011-03-23 13:09 UTC #3 lore raw

PATCH 1/1 hv: make vmbus_loglevel writeable

make /sys/module/hv_vmbus/parameters/vmbus_loglevel writeable by root.

Signed-off-by Olaf Hering <[email protected]>

---
 drivers/staging/hv/vmbus_drv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/hv/vmbus_drv.c +1 -1

Index: linux-2.6/drivers/staging/hv/vmbus_drv.c
===================================================================
@@ -1022,7 +1022,7 @@ MODULE_DEVICE_TABLE(pci, microsoft_hv_pc
 MODULE_LICENSE("GPL");
 MODULE_VERSION(HV_DRV_VERSION);
 module_param(vmbus_irq, int, S_IRUGO);
-module_param(vmbus_loglevel, int, S_IRUGO);
+module_param(vmbus_loglevel, int, S_IRUGO|S_IWUSR);
 
 module_init(vmbus_init);
 module_exit(vmbus_exit);

Olaf Hering

author

2011-03-23 13:11 UTC #4 lore raw

PATCH 1/1 hv: remove double newline in DPRINT functions

Remove double newline in DPRINT* functions, the macro already adds a newline.

Signed-off-by Olaf Hering <[email protected]>

---
compile tested

 drivers/staging/hv/blkvsc_drv.c  |   70 +++++++++++++++++++--------------------
 drivers/staging/hv/hv_mouse.c    |    4 +-
 drivers/staging/hv/netvsc.c      |    2 -
 drivers/staging/hv/storvsc.c     |    8 ++--
 drivers/staging/hv/storvsc_drv.c |    2 -
 5 files changed, 43 insertions(+), 43 deletions(-)

drivers/staging/hv/blkvsc_drv.c +35 ~~-35~~

Index: linux-2.6/drivers/staging/hv/blkvsc_drv.c
===================================================================
@@ -405,7 +405,7 @@ static void blkvsc_shutdown(struct devic
 	if (!blkdev)
 		return;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkvsc_shutdown - users %d disk %s\n",
+	DPRINT_DBG(BLKVSC_DRV, "blkvsc_shutdown - users %d disk %s",
 		   blkdev->users, blkdev->gd->disk_name);
 
 	spin_lock_irqsave(&blkdev->lock, flags);

@@ -435,7 +435,7 @@ static int blkvsc_do_flush(struct block_
 {
 	struct blkvsc_request *blkvsc_req;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_flush()\n");
+	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_flush()");
 
 	if (blkdev->device_type != HARDDISK_TYPE)
 		return 0;

@@ -479,7 +479,7 @@ static int blkvsc_do_inquiry(struct bloc
 	unsigned char *buf;
 	unsigned char device_type;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_inquiry()\n");
+	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_inquiry()");
 
 	blkvsc_req = kmem_cache_alloc(blkdev->request_pool, GFP_KERNEL);
 	if (!blkvsc_req)

@@ -515,7 +515,7 @@ static int blkvsc_do_inquiry(struct bloc
 
 	blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion);
 
-	DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n",
+	DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d",
 		   blkvsc_req, blkvsc_req->cond);
 
 	wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond);

@@ -535,7 +535,7 @@ static int blkvsc_do_inquiry(struct bloc
 		blkdev->device_type = UNKNOWN_DEV_TYPE;
 	}
 
-	DPRINT_DBG(BLKVSC_DRV, "device type %d\n", device_type);
+	DPRINT_DBG(BLKVSC_DRV, "device type %d", device_type);
 
 	blkdev->device_id_len = buf[7];
 	if (blkdev->device_id_len > 64)

@@ -562,7 +562,7 @@ static int blkvsc_do_read_capacity(struc
 	unsigned char *buf;
 	struct scsi_sense_hdr sense_hdr;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_read_capacity()\n");
+	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_read_capacity()");
 
 	blkdev->sector_size = 0;
 	blkdev->capacity = 0;

@@ -599,7 +599,7 @@ static int blkvsc_do_read_capacity(struc
 
 	blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion);
 
-	DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n",
+	DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d",
 		   blkvsc_req, blkvsc_req->cond);
 
 	wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond);

@@ -639,7 +639,7 @@ static int blkvsc_do_read_capacity16(str
 	unsigned char *buf;
 	struct scsi_sense_hdr sense_hdr;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_read_capacity16()\n");
+	DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_read_capacity16()");
 
 	blkdev->sector_size = 0;
 	blkdev->capacity = 0;

@@ -676,7 +676,7 @@ static int blkvsc_do_read_capacity16(str
 
 	blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion);
 
-	DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n",
+	DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d",
 		   blkvsc_req, blkvsc_req->cond);
 
 	wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond);

@@ -727,7 +727,7 @@ static int blkvsc_remove(struct device *
 	unsigned long flags;
 	int ret;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");
+	DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()");
 
 	if (!storvsc_drv_obj->base.dev_rm)
 		return -1;

@@ -847,7 +847,7 @@ static int blkvsc_submit_request(struct
 
 	DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - "
 		   "req %p type %s start_sector %lu count %ld offset %d "
-		   "len %d\n", blkvsc_req,
+		   "len %d", blkvsc_req,
 		   (blkvsc_req->write) ? "WRITE" : "READ",
 		   (unsigned long) blkvsc_req->sector_start,
 		   blkvsc_req->sector_count,

@@ -856,7 +856,7 @@ static int blkvsc_submit_request(struct
 #if 0
 	for (i = 0; i < (blkvsc_req->request.data_buffer.len >> 12); i++) {
 		DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - "
-			   "req %p pfn[%d] %llx\n",
+			   "req %p pfn[%d] %llx",
 			   blkvsc_req, i,
 			   blkvsc_req->request.data_buffer.pfn_array[i]);
 	}

@@ -911,7 +911,7 @@ static int blkvsc_do_request(struct bloc
 	int pending = 0;
 	struct blkvsc_request_group *group = NULL;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p sect %lu\n", blkdev, req,
+	DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p sect %lu", blkdev, req,
 		  (unsigned long)blk_rq_pos(req));
 
 	/* Create a group to tie req to list of blkvsc_reqs */

@@ -933,7 +933,7 @@ static int blkvsc_do_request(struct bloc
 			bio_for_each_segment(bvec, bio, seg_idx) {
 				DPRINT_DBG(BLKVSC_DRV, "bio_for_each_segment() "
 					   "- req %p bio %p bvec %p seg_idx %d "
-					   "databuf_idx %d\n", req, bio, bvec,
+					   "databuf_idx %d", req, bio, bvec,
 					   seg_idx, databuf_idx);
 
 				/* Get a new storvsc request */

@@ -1013,7 +1013,7 @@ static int blkvsc_do_request(struct bloc
 
 	/* Handle the last one */
 	if (blkvsc_req) {
-		DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p group %p count %d\n",
+		DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p group %p count %d",
 			   blkdev, req, blkvsc_req->group,
 			   blkvsc_req->group->outstanding);

@@ -1031,7 +1031,7 @@ static int blkvsc_do_request(struct bloc
 		if (pending) {
 			DPRINT_DBG(BLKVSC_DRV, "adding blkvsc_req to "
 				   "pending_list - blkvsc_req %p start_sect %lu"
-				   " sect_count %ld (%lu %ld)\n", blkvsc_req,
+				   " sect_count %ld (%lu %ld)", blkvsc_req,
 				   (unsigned long)blkvsc_req->sector_start,
 				   blkvsc_req->sector_count,
 				   (unsigned long)start_sector,

@@ -1050,7 +1050,7 @@ static int blkvsc_do_request(struct bloc
 
 			DPRINT_DBG(BLKVSC_DRV, "submitted blkvsc_req %p "
 				   "start_sect %lu sect_count %ld (%lu %ld) "
-				   "ret %d\n", blkvsc_req,
+				   "ret %d", blkvsc_req,
 				   (unsigned long)blkvsc_req->sector_start,
 				   blkvsc_req->sector_count,
 				   (unsigned long)start_sector,

@@ -1069,7 +1069,7 @@ static void blkvsc_cmd_completion(struct
 			(struct block_device_context *)blkvsc_req->dev;
 	struct scsi_sense_hdr sense_hdr;
 
-	DPRINT_DBG(BLKVSC_DRV, "blkvsc_cmd_completion() - req %p\n",
+	DPRINT_DBG(BLKVSC_DRV, "blkvsc_cmd_completion() - req %p",
 		   blkvsc_req);
 
 	blkdev->num_outstanding_reqs--;

@@ -1096,7 +1096,7 @@ static void blkvsc_request_completion(st
 
 	DPRINT_DBG(BLKVSC_DRV, "blkdev %p blkvsc_req %p group %p type %s "
 		   "sect_start %lu sect_count %ld len %d group outstd %d "
-		   "total outstd %d\n",
+		   "total outstd %d",
 		   blkdev, blkvsc_req, blkvsc_req->group,
 		   (blkvsc_req->write) ? "WRITE" : "READ",
 		   (unsigned long)blkvsc_req->sector_start,

@@ -1120,7 +1120,7 @@ static void blkvsc_request_completion(st
 					 &blkvsc_req->group->blkvsc_req_list,
 					 req_entry) {
 			DPRINT_DBG(BLKVSC_DRV, "completing blkvsc_req %p "
-				   "sect_start %lu sect_count %ld\n",
+				   "sect_start %lu sect_count %ld",
 				   comp_req,
 				   (unsigned long)comp_req->sector_start,
 				   comp_req->sector_count);

@@ -1134,7 +1134,7 @@ static void blkvsc_request_completion(st
 				 * All the sectors have been xferred ie the
 				 * request is done
 				 */
-				DPRINT_DBG(BLKVSC_DRV, "req %p COMPLETED\n",
+				DPRINT_DBG(BLKVSC_DRV, "req %p COMPLETED",
 					   comp_req->req);
 				kmem_cache_free(blkdev->request_pool,
 						comp_req->group);

@@ -1174,7 +1174,7 @@ static int blkvsc_cancel_pending_reqs(st
 					 &pend_req->group->blkvsc_req_list,
 					 req_entry) {
 			DPRINT_DBG(BLKVSC_DRV, "completing blkvsc_req %p "
-				   "sect_start %lu sect_count %ld\n",
+				   "sect_start %lu sect_count %ld",
 				   comp_req,
 				   (unsigned long) comp_req->sector_start,
 				   comp_req->sector_count);

@@ -1198,7 +1198,7 @@ static int blkvsc_cancel_pending_reqs(st
 			kmem_cache_free(blkdev->request_pool, comp_req);
 		}
 
-		DPRINT_DBG(BLKVSC_DRV, "cancelling pending request - %p\n",
+		DPRINT_DBG(BLKVSC_DRV, "cancelling pending request - %p",
 			   pend_req);
 
 		list_del(&pend_req->pend_entry);

@@ -1215,7 +1215,7 @@ static int blkvsc_cancel_pending_reqs(st
 				 */
 				DPRINT_DBG(BLKVSC_DRV,
 					   "blkvsc_cancel_pending_reqs() - "
-					   "req %p COMPLETED\n", pend_req->req);
+					   "req %p COMPLETED", pend_req->req);
 				kmem_cache_free(blkdev->request_pool,
 						pend_req->group);
 			}

@@ -1236,7 +1236,7 @@ static int blkvsc_do_pending_reqs(struct
 	/* Flush the pending list first */
 	list_for_each_entry_safe(pend_req, tmp, &blkdev->pending_list,
 				 pend_entry) {
-		DPRINT_DBG(BLKVSC_DRV, "working off pending_list - %p\n",
+		DPRINT_DBG(BLKVSC_DRV, "working off pending_list - %p",
 			   pend_req);
 
 		ret = blkvsc_submit_request(pend_req,

@@ -1256,9 +1256,9 @@ static void blkvsc_request(struct reques
 	struct request *req;
 	int ret = 0;
 
-	DPRINT_DBG(BLKVSC_DRV, "- enter\n");
+	DPRINT_DBG(BLKVSC_DRV, "- enter");
 	while ((req = blk_peek_request(queue)) != NULL) {
-		DPRINT_DBG(BLKVSC_DRV, "- req %p\n", req);
+		DPRINT_DBG(BLKVSC_DRV, "- req %p", req);
 
 		blkdev = req->rq_disk->private_data;
 		if (blkdev->shutting_down || req->cmd_type != REQ_TYPE_FS ||

@@ -1271,7 +1271,7 @@ static void blkvsc_request(struct reques
 
 		if (ret != 0) {
 			DPRINT_DBG(BLKVSC_DRV,
-				   "- stop queue - pending_list not empty\n");
+				   "- stop queue - pending_list not empty");
 			blk_stop_queue(queue);
 			break;
 		}

@@ -1280,11 +1280,11 @@ static void blkvsc_request(struct reques
 
 		ret = blkvsc_do_request(blkdev, req);
 		if (ret > 0) {
-			DPRINT_DBG(BLKVSC_DRV, "- stop queue - no room\n");
+			DPRINT_DBG(BLKVSC_DRV, "- stop queue - no room");
 			blk_stop_queue(queue);
 			break;
 		} else if (ret < 0) {
-			DPRINT_DBG(BLKVSC_DRV, "- stop queue - no mem\n");
+			DPRINT_DBG(BLKVSC_DRV, "- stop queue - no mem");
 			blk_requeue_request(queue, req);
 			blk_stop_queue(queue);
 			break;

@@ -1296,7 +1296,7 @@ static int blkvsc_open(struct block_devi
 {
 	struct block_device_context *blkdev = bdev->bd_disk->private_data;
 
-	DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s\n", blkdev->users,
+	DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s", blkdev->users,
 		   blkdev->gd->disk_name);
 
 	mutex_lock(&blkvsc_mutex);

@@ -1319,7 +1319,7 @@ static int blkvsc_release(struct gendisk
 {
 	struct block_device_context *blkdev = disk->private_data;
 
-	DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s\n", blkdev->users,
+	DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s", blkdev->users,
 		   blkdev->gd->disk_name);
 
 	mutex_lock(&blkvsc_mutex);

@@ -1339,7 +1339,7 @@ static int blkvsc_release(struct gendisk
 
 static int blkvsc_media_changed(struct gendisk *gd)
 {
-	DPRINT_DBG(BLKVSC_DRV, "- enter\n");
+	DPRINT_DBG(BLKVSC_DRV, "- enter");
 	return 1;
 }

@@ -1347,7 +1347,7 @@ static int blkvsc_revalidate_disk(struct
 {
 	struct block_device_context *blkdev = gd->private_data;
 
-	DPRINT_DBG(BLKVSC_DRV, "- enter\n");
+	DPRINT_DBG(BLKVSC_DRV, "- enter");
 
 	if (blkdev->device_type == DVD_TYPE) {
 		blkvsc_do_read_capacity(blkdev);

@@ -1451,7 +1451,7 @@ static int blkvsc_ioctl(struct block_dev
 	 */
 #if 0
 	case HDIO_GET_IDENTITY:
-		DPRINT_INFO(BLKVSC_DRV, "HDIO_GET_IDENTITY\n");
+		DPRINT_INFO(BLKVSC_DRV, "HDIO_GET_IDENTITY");
 		if (copy_to_user((void __user *)arg, blkdev->device_id,
 				 blkdev->device_id_len))
 			ret = -EFAULT;

drivers/staging/hv/hv_mouse.c +2 -2

Index: linux-2.6/drivers/staging/hv/hv_mouse.c
===================================================================
@@ -917,13 +917,13 @@ static void reportdesc_callback(struct h
 			input_device_ctx->connected = 1;
 
 			DPRINT_INFO(INPUTVSC_DRV,
-				     "HID device claimed by input\n");
+				     "HID device claimed by input");
 		}
 
 		if (!hid_dev->claimed) {
 			DPRINT_ERR(INPUTVSC_DRV,
 				    "HID device not claimed by "
-				    "input or hiddev\n");
+				    "input or hiddev");
 		}
 
 		input_device_ctx->hid_device = hid_dev;

drivers/staging/hv/netvsc.c +1 -1

Index: linux-2.6/drivers/staging/hv/netvsc.c
===================================================================
@@ -1277,7 +1277,7 @@ static void netvsc_channel_cb(void *cont
 				default:
 					DPRINT_ERR(NETVSC,
 						   "unhandled packet type %d, "
-						   "tid %llx len %d\n",
+						   "tid %llx len %d",
 						   desc->type, request_id,
 						   bytes_recvd);
 					break;

drivers/staging/hv/storvsc.c +4 -4

Index: linux-2.6/drivers/staging/hv/storvsc.c
===================================================================
@@ -392,7 +392,7 @@ static void stor_vsc_on_io_completion(st
 
 	if (request->status != 0 || vstor_packet->vm_srb.srb_status != 1) {
 		DPRINT_WARN(STORVSC,
-			    "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
+			    "cmd 0x%x scsi status 0x%x srb status 0x%x",
 			    request->cdb[0], vstor_packet->vm_srb.scsi_status,
 			    vstor_packet->vm_srb.srb_status);
 	}

@@ -402,7 +402,7 @@ static void stor_vsc_on_io_completion(st
 		if (vstor_packet->vm_srb.srb_status & 0x80) {
 			/* autosense data available */
 			DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data "
-				    "valid - len %d\n", request_ext,
+				    "valid - len %d", request_ext,
 				    vstor_packet->vm_srb.sense_info_length);
 
 			/* ASSERT(vstor_packet->vm_srb.sense_info_length <= */

@@ -581,7 +581,7 @@ static int stor_vsc_on_device_add(struct
 	device_info->path_id = stor_device->path_id;
 	device_info->target_id = stor_device->target_id;
 
-	DPRINT_DBG(STORVSC, "assigned port %u, path %u target %u\n",
+	DPRINT_DBG(STORVSC, "assigned port %u, path %u target %u",
 		   stor_device->port_number, stor_device->path_id,
 		   stor_device->target_id);

@@ -822,7 +822,7 @@ int stor_vsc_initialize(struct hv_driver
 			   sizeof(struct vstor_packet) + sizeof(u64),
 			   sizeof(u64)));
 
-	DPRINT_INFO(STORVSC, "max io %u, currently %u\n",
+	DPRINT_INFO(STORVSC, "max io %u, currently %u",
 		    stor_driver->max_outstanding_req_per_channel,
 		    STORVSC_MAX_IO_REQUESTS);

drivers/staging/hv/storvsc_drv.c +1 -1

Index: linux-2.6/drivers/staging/hv/storvsc_drv.c
===================================================================
@@ -720,7 +720,7 @@ static int storvsc_queuecommand_lck(stru
 		request->data_buffer.offset = sgl[0].offset;
 
 		for (i = 0; i < sg_count; i++) {
-			DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d\n",
+			DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d",
 				   i, sgl[i].length, sgl[i].offset);
 			request->data_buffer.pfn_array[i] =
 				page_to_pfn(sg_page((&sgl[i])));

Greg KH

2011-04-05 07:36 UTC #5 lore raw

In reply to Olaf Hering

Quoted 4 lines · Olaf Hering

Reduce indention in vmbus_on_event() by converting two if (var) to if (!var)
Signed-off-by Olaf Hering <[email protected]>

This, and I think your other ones in this series, no longer applies due to changes made by others to this driver.

Can you resync off of the next linux-next release and resend the patches? I'd also like to get an ack or tested-by or something from Hank and the other developers of these drivers before accepting them.

thanks,

greg k-h

Olaf Hering

author

2011-04-12 13:26 UTC #6 lore raw

Quoted 4 lines · Greg KH

Quoted 3 lines · Olaf Hering
Reduce indention in vmbus_on_event() by converting two if (var) to if (!var)

Quoted 8 lines

Quoted 1 line
Signed-off-by Olaf Hering <[email protected]>
This, and I think your other ones in this series, no longer applies due to changes made by others to this driver.
Can you resync off of the next linux-next release and resend the patches? I'd also like to get an ack or tested-by or something from Hank and the other developers of these drivers before accepting them.

Yes, I will look at it this in the next days.

Olaf