drbd: cleanup useless leftover warn/error printk's

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

2 files changed, 1 insertions, 6 deletions

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 9ae33a5bcf66..87925e97e613 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -780,9 +780,6 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu
         blk_queue_segment_boundary(q, PAGE_SIZE-1);
         blk_stack_limits(&q->limits, &b->limits, 0);
 
-        if (b->merge_bvec_fn)
-                dev_warn(DEV, "Backing device's merge_bvec_fn() = %p\n",
-                     b->merge_bvec_fn);
         dev_info(DEV, "max_segment_size ( = BIO size ) = %u\n", queue_max_segment_size(q));
 
         if (q->backing_dev_info.ra_pages != b->backing_dev_info.ra_pages) {
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 4dc6a8870526..5a4b6dcd48f2 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4591,10 +4591,8 @@ int drbd_asender(struct drbd_thread *thi)
                 while (1) {
                         clear_bit(SIGNAL_ASENDER, &mdev->flags);
                         flush_signals(current);
-                        if (!drbd_process_done_ee(mdev)) {
-                                dev_err(DEV, "process_done_ee() = NOT_OK\n");
+                        if (!drbd_process_done_ee(mdev))
                                 goto reconnect;
-                        }
                         /* to avoid race with newly queued ACKs */
                         set_bit(SIGNAL_ASENDER, &mdev->flags);
                         spin_lock_irq(&mdev->req_lock);