From patchwork Wed Apr 23 17:28:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 28918 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D7143203AC for ; Wed, 23 Apr 2014 17:29:02 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf7309783iec.3 for ; Wed, 23 Apr 2014 10:29:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=jnWw5VV+Wn4//wr2fMl6XYK2q4mEA9fAu0MB18o0rsM=; b=UzKmqhyWBcl84QQ0+zBEf0UctiA8RLwbyneBg2hSJt3IUs2MAoqF//HKAv8SU0Lusk NdRYMyEo7lSwm3Btqw/rEt6rokCmOwr6+ayBrApSfyU9RuNN6l0tV0CR9wO5KfcVNnb5 35nnr6zN18/7ijImnYdYV3iHylhp4c8U73Im4wvzZMWtsldqI8T+mQ7fXCTkm5IBOXS3 G7gXRFDOvXv1rjVfCXyFe8HH7EgQ8nV+hGQ595ZGTJgvqQAH9nzBUyi65dmbucVRzS/6 5u9MED4pMgAISE9sS+rPxyGSkZa0VC7qfSWYR/40vr3QvovpCcI9sT2tkWsgJYdqt/RG KRoA== X-Gm-Message-State: ALoCoQlBrFmRWBiOqv7usf6KjSh52HH7TVousL68iCM39/2qFg1/O+eyWS0BRB40QrzNNBQo3N/g X-Received: by 10.182.158.135 with SMTP id wu7mr26591967obb.19.1398274142347; Wed, 23 Apr 2014 10:29:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.163 with SMTP id d32ls679490qgd.44.gmail; Wed, 23 Apr 2014 10:29:02 -0700 (PDT) X-Received: by 10.58.171.229 with SMTP id ax5mr14280923vec.24.1398274142175; Wed, 23 Apr 2014 10:29:02 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id rn1si300738vec.186.2014.04.23.10.29.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:29:02 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hr9so1580854vcb.29 for ; Wed, 23 Apr 2014 10:29:02 -0700 (PDT) X-Received: by 10.220.7.131 with SMTP id d3mr779742vcd.45.1398274142099; Wed, 23 Apr 2014 10:29:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp120701vcb; Wed, 23 Apr 2014 10:29:01 -0700 (PDT) X-Received: by 10.194.103.36 with SMTP id ft4mr2668019wjb.66.1398274139582; Wed, 23 Apr 2014 10:28:59 -0700 (PDT) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mx.google.com with ESMTPS id ph11si7658713wic.95.2014.04.23.10.28.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:28:59 -0700 (PDT) Received-SPF: none (google.com: peter.griffin@linaro.org does not designate permitted sender hosts) client-ip=74.125.82.52; Received: by mail-wg0-f52.google.com with SMTP id k14so1146573wgh.23 for ; Wed, 23 Apr 2014 10:28:59 -0700 (PDT) X-Received: by 10.180.104.5 with SMTP id ga5mr2695816wib.47.1398274139035; Wed, 23 Apr 2014 10:28:59 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id go20sm2372382wjc.18.2014.04.23.10.28.58 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:28:58 -0700 (PDT) From: Peter Griffin To: peter.griffin@linaro.org Cc: patches@linaro.org, linaro-kernel@lists.linaro.org Subject: [PATCH 05/13] video/mbx: fix building debugfs support Date: Wed, 23 Apr 2014 18:28:39 +0100 Message-Id: <1398274127-2106-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398274127-2106-1-git-send-email-peter.griffin@linaro.org> References: <1398274127-2106-1-git-send-email-peter.griffin@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Arnd Bergmann The mbx framebuffer debugfs support apparently hasn't been able to build for a long time, at least since 2006 when the u.generic_ip field in the inode was removed. This fixes the obvious bug, and also makes it possible to build the driver as a module when debugfs support is enabled, by simply including the C file. It's ugly, but it won't make the driver any worse than it already is, and doesn't require a more invasive change that might break it further. Signed-off-by: Arnd Bergmann Signed-off-by: Peter Griffin Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: Raphael Assenat private_data = inode->u.generic_ip; + file->private_data = inode->i_private; return 0; } diff --git a/drivers/video/fbdev/mbx/mbxfb.c b/drivers/video/fbdev/mbx/mbxfb.c index f0a5392..2bd52ed 100644 --- a/drivers/video/fbdev/mbx/mbxfb.c +++ b/drivers/video/fbdev/mbx/mbxfb.c @@ -877,6 +877,8 @@ static int mbxfb_resume(struct platform_device *dev) #ifndef CONFIG_FB_MBX_DEBUG #define mbxfb_debugfs_init(x) do {} while(0) #define mbxfb_debugfs_remove(x) do {} while(0) +#else +#include "mbxdebugfs.c" #endif #define res_size(_r) (((_r)->end - (_r)->start) + 1)