From patchwork Wed May 15 21:04:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Jackson X-Patchwork-Id: 2574421 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 349E83FDBC for ; Wed, 15 May 2013 21:04:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932801Ab3EOVEM (ORCPT ); Wed, 15 May 2013 17:04:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13925 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932431Ab3EOVEM (ORCPT ); Wed, 15 May 2013 17:04:12 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4FL4CZg022849 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 15 May 2013 17:04:12 -0400 Received: from ergine.redhat.com (vpn-61-126.rdu2.redhat.com [10.10.61.126]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r4FL4BbH009401 for ; Wed, 15 May 2013 17:04:11 -0400 From: Adam Jackson To: linux-fbdev@vger.kernel.org Subject: [PATCH] video: Use less worrisome language in fbdev handoff Date: Wed, 15 May 2013 17:04:11 -0400 Message-Id: <1368651851-14326-1-git-send-email-ajax@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org For some reason people see "conflicting" and think it's a problem, even though it's totally normal. Just call it a handoff. Signed-off-by: Adam Jackson --- drivers/video/fbmem.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 098bfc6..2ec56a2 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -1576,10 +1576,9 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a, if (fb_do_apertures_overlap(gen_aper, a) || (primary && gen_aper && gen_aper->count && gen_aper->ranges[0].base == VGA_FB_PHYS)) { - - printk(KERN_INFO "fb: conflicting fb hw usage " - "%s vs %s - removing generic driver\n", - name, registered_fb[i]->fix.id); + printk(KERN_INFO "fb: Handoff from generic %s " + "driver to %s\n", registered_fb[i]->fix.id, + name); do_unregister_framebuffer(registered_fb[i]); } }