From patchwork Thu Nov 8 16:45:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 1716501 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 287FBDF280 for ; Thu, 8 Nov 2012 16:45:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756210Ab2KHQp0 (ORCPT ); Thu, 8 Nov 2012 11:45:26 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:52174 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756202Ab2KHQp0 (ORCPT ); Thu, 8 Nov 2012 11:45:26 -0500 Received: by mail-pa0-f46.google.com with SMTP id hz1so2107516pad.19 for ; Thu, 08 Nov 2012 08:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=lPL/x03viTl/KwUBiWRkwvDWnLH2KcRhKJeBOCAQ6Xk=; b=QegNjrbQOZiu3BqrpscRuE0inIzNwVZoPLxhRP9IoPNklwGR4eTAIPmsmHrIh7yTNW BLqYCXVONABd/CJF+lHA7FfjAa5IppKoBVUOtJJtkFJZBe7xoF1CzOB/xvTninRvuhYe 76pHGjt5cOSzLopSHmH9sMLFN7KN3ldzRdCE+HL54LC+cKKczJAEm2SLbiypJGrffWpk UZ9MXKiVZbCTaxrFmdStZ1iYA1sucjMTwSmgVJsRgr+ZUTsM65g86yeLNU8n+eEjMHQI NImH/kukiUUrB+sgd818hJxjA9GuAIi4YJfbkzBJE9isb2yz6B3ZW7aQE05bXMdidXfA 7sPA== Received: by 10.68.224.9 with SMTP id qy9mr25444798pbc.3.1352393125828; Thu, 08 Nov 2012 08:45:25 -0800 (PST) Received: from mailhub.coreip.homeip.net (c-67-188-112-76.hsd1.ca.comcast.net. [67.188.112.76]) by mx.google.com with ESMTPS id wf8sm16178861pbc.65.2012.11.08.08.45.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Nov 2012 08:45:24 -0800 (PST) Date: Thu, 8 Nov 2012 08:45:21 -0800 From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: Alban Bedel Subject: [PATCH] Input: marix-keymap - automatically allocate memory for keymap Message-ID: <20121108164519.GA9334@core.coreip.homeip.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org In device tree enabled setups requiring preallocated memory for storing keymap is quite often awkward, so let's provide an option of allocating it directly in matrix_keypad_build_keymap(). Signed-off-by: Dmitry Torokhov --- drivers/input/matrix-keymap.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c index 443ad64b..da04f13 100644 --- a/drivers/input/matrix-keymap.c +++ b/drivers/input/matrix-keymap.c @@ -122,6 +122,11 @@ static int matrix_keypad_parse_of_keymap(const char *propname, * it will attempt load the keymap from property specified by @keymap_name * argument (or "linux,keymap" if @keymap_name is %NULL). * + * If @keymap is %NULL the function will automatically allocate managed + * block of memory to store the keymap. This memory will be associated with + * the parent device and automatically freed when device unbinds from the + * driver. + * * Callers are expected to set up input_dev->dev.parent before calling this * function. */ @@ -132,12 +137,27 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data, struct input_dev *input_dev) { unsigned int row_shift = get_count_order(cols); + size_t max_keys = rows << row_shift; int i; int error; + if (WARN_ON(!input_dev->dev.parent)) + return -EINVAL; + + if (!keymap) { + keymap = devm_kzalloc(input_dev->dev.parent, + max_keys * sizeof(*keymap), + GFP_KERNEL); + if (!keymap) { + dev_err(input_dev->dev.parent, + "Unable to allocate memory for keymap"); + return -ENOMEM; + } + } + input_dev->keycode = keymap; input_dev->keycodesize = sizeof(*keymap); - input_dev->keycodemax = rows << row_shift; + input_dev->keycodemax = max_keys; __set_bit(EV_KEY, input_dev->evbit);