From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f44.google.com (mail-dl1-f44.google.com [74.125.82.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71C4D3C7E18 for ; Tue, 5 May 2026 05:00:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777957216; cv=none; b=JDideZeTXSlLQhJpVsBtd1x8eKdhy7VWBYoah2YM6GTzc0bgJwoZG8vlgf1UGayh3t+BWhTfWI/1rl1GJh7FlG4DWTgBx25CndYpzqwBIw80cjF2EZN/A8Jna29rOjs6A8IgVxv17IKR9DY0OLf3KTz+kNPBEq3eDCCsI8UiKek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777957216; c=relaxed/simple; bh=sX7LI9cJsDgaVno54OstmKI9vx15QEujZXCD0CAXJ3k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F2Vz7gJ/ybyTRRc48TrofpHxvC1cplt4pVoX+RzThmd8wi/nwIgWgT2ovXIUzAJ51wFSDmKdX5rIcA2V7zdTDVesEDcGYDLQFzK4wje/62cLJHEda5KllYreVS03vCL3WfML04OgzsSRvK5R8oc1bHQN5R5lLDdG3QTxczDCDfI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=p1ySq1T7; arc=none smtp.client-ip=74.125.82.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p1ySq1T7" Received: by mail-dl1-f44.google.com with SMTP id a92af1059eb24-1309f4ee97fso1291413c88.1 for ; Mon, 04 May 2026 22:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777957214; x=1778562014; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+kKhA5i6t85r7bsw25QU/4JDOTnDB8uAmTRJmc8QB64=; b=p1ySq1T7MgyGxh/o+gGUD7DhWvo8hnDNtq3jUJ1I5NQwz3ojmuK7LNkEF3DhxVUxn9 nIuEVA8/3TtBapO6RGDXbQ2r+3Aw5RgwxW61NRwriTaC4UAOYkJ1xyCAk6kVgqlvc2d8 AWumjBBtbsDLl86j50u0m+8Uclfe5c6dien16nR7t8bJ/1GZ6tUvIbAMa1eQCIu5FaK2 gkPmzFkLh2G5XJdIl1yblnYKvPYVpj4hvweiReKuZqfxuatPfe9Nn7Sxz1VmHVccsiFW 75qm/xYuFZMA8FiD5Gf4T4D3F0VOaeBUeCw5Ls78ajTUZzigIlROcLDVAbc+BQ8nr8G9 zJVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777957214; x=1778562014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+kKhA5i6t85r7bsw25QU/4JDOTnDB8uAmTRJmc8QB64=; b=ptFozjzFeWicidQI471+0lr1jTKlDgjOZeyml5oEV+k6pCRCWo5PZTq5Kq2WG83EJ/ PAvuvOjp1qiFfVlClnLB89YilTv4dYGGn+fuSVukIibmIC9PFKdrcbbJFXE5tLxwshPk zDiY89TTJLWOGkrGx7kJUpSpM6UOQJ8zFd57ymptRwdPz19Tzg9Lj49CXnG9woP5cI76 P9P/QqCcrm69O3zNTGlOpM7qoaB99tG7YlN72TJctRoELz14XeLRK1cAZvsb5JNtujpj lodU7bVj5EH7I3Wp7FLZm9M5wqWSRZJ7cde6qGglo5EyGfsSlUOkG4SDWkvD+G6vEdbl cgeQ== X-Forwarded-Encrypted: i=1; AFNElJ9+rwrnMCewzmsqFBYV1ZsJkzI1JngXUcZTtkJ6lR9zw3Z0G2x3qhwCGZumy7haKEyfhG/f+NeuqR9FM1Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwEstPOxP/vDHuNLpq2iTbixmJzSPXvLADtCgytr8Og3tHIV9yA JIFjboLfaVSh5wlNu4w2gzN9qJFLWHCjbBbu+hmyLYZe/HiTvcjkdvvx X-Gm-Gg: AeBDievYoFutx57NFV6NvaPtRXZJP/J3cJ608W81rqu4v10WSeZeTgHhKOEhSw0Sio8 W/r951w9Os6R0pjORHA464qT290f2R1mzqin0tLKFWd15pMu5GSA5esa1Uvkg4KE8O7v5GJvvhi iYJ5pdEaj0OB2LF9eDvEzVyc9D7fn+4qwayc0shAH4od7PTdBkU3Rn3olnV/3yC3zMxH2d1s9pH um//l9gHPVZLuPKEXgoj7ptgfdz0pXY07Skn3AzLUd31Vd8gYUCXL6HWlKgvrQo4CBrxdBt6cBx PPgjUEzWMK2wIWroMRNeKqTWnT2vpS0TDGKEGxDJ+r+agJ5nc2Fty2v3OlnynzmMGNavtynuafO /E4WcI+jHgi7doduqqLL1FWXK24jdHvsZmTQ5hjN6BTwzQ1DLaeKoLfuYTnpE/kfFHcUd6qpdRS SrM71l3O71XdPYW4NTbd5f7jnrC9a4Ty/7uGea9CG0U40VELFPBBgH93/Q+Ef0wWvnT6eF1Nw4p tkHUv9CHwk4h2zVpsjz7nQC9A== X-Received: by 2002:a05:7022:e994:b0:122:3a5:fc42 with SMTP id a92af1059eb24-12dfd81a4b8mr6180171c88.20.1777957214280; Mon, 04 May 2026 22:00:14 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:94ef:a6f3:2c96:2d58]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12df827a73fsm16897502c88.1.2026.05.04.22.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 22:00:12 -0700 (PDT) From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: Marge Yang , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH v2 10/20] Input: rmi4 - refactor function allocation and registration Date: Mon, 4 May 2026 21:59:40 -0700 Message-ID: <20260505045952.1570713-10-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260505045952.1570713-1-dmitry.torokhov@gmail.com> References: <20260505045952.1570713-1-dmitry.torokhov@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently, rmi_create_function() allocates memory for the rmi_function structure, but rmi_register_function() initializes the device via device_initialize(). This split of ownership makes error handling in rmi_create_function() confusing because the caller must be aware that if rmi_register_function() fails, it has already called put_device() to clean up the memory. To make the memory lifecycle explicit and fix potential leaks cleanly introduce rmi_alloc_function() to handle memory allocation and device initialization, and make the caller of rmi_register_function() responsible for cleanup. Assisted-by: Gemini:gemini-3.1-pro Signed-off-by: Dmitry Torokhov --- drivers/input/rmi4/rmi_bus.c | 32 +++++++++++++++++++++----------- drivers/input/rmi4/rmi_bus.h | 1 + drivers/input/rmi4/rmi_driver.c | 10 ++++------ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c index 687cb987bc13..71a25df73984 100644 --- a/drivers/input/rmi4/rmi_bus.c +++ b/drivers/input/rmi4/rmi_bus.c @@ -237,36 +237,46 @@ static int rmi_function_remove(struct device *dev) return 0; } -int rmi_register_function(struct rmi_function *fn) +struct rmi_function *rmi_alloc_function(struct rmi_device *rmi_dev, u8 id) { - struct rmi_device *rmi_dev = fn->rmi_dev; - int error; + struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev); + struct rmi_function *fn; + + fn = kzalloc(sizeof(*fn) + + BITS_TO_LONGS(data->irq_count) * sizeof(unsigned long), + GFP_KERNEL); + if (!fn) + return NULL; device_initialize(&fn->dev); - dev_set_name(&fn->dev, "%s.fn%02x", - dev_name(&rmi_dev->dev), fn->fd.function_number); + dev_set_name(&fn->dev, "%s.fn%02x", dev_name(&rmi_dev->dev), id); fn->dev.parent = &rmi_dev->dev; fn->dev.type = &rmi_function_type; fn->dev.bus = &rmi_bus_type; + fn->rmi_dev = rmi_dev; + + return fn; +} + +int rmi_register_function(struct rmi_function *fn) +{ + struct rmi_device *rmi_dev = fn->rmi_dev; + int error; error = device_add(&fn->dev); if (error) { dev_err(&rmi_dev->dev, - "Failed device_register function device %s\n", + "Failed to register function device %s\n", dev_name(&fn->dev)); - goto err_put_device; + return error; } rmi_dbg(RMI_DEBUG_CORE, &rmi_dev->dev, "Registered F%02X.\n", fn->fd.function_number); return 0; - -err_put_device: - put_device(&fn->dev); - return error; } void rmi_unregister_function(struct rmi_function *fn) diff --git a/drivers/input/rmi4/rmi_bus.h b/drivers/input/rmi4/rmi_bus.h index d4d0d82c69aa..90122df21f74 100644 --- a/drivers/input/rmi4/rmi_bus.h +++ b/drivers/input/rmi4/rmi_bus.h @@ -49,6 +49,7 @@ struct rmi_function { bool rmi_is_function_device(struct device *dev); +struct rmi_function *rmi_alloc_function(struct rmi_device *rmi_dev, u8 id); int __must_check rmi_register_function(struct rmi_function *); void rmi_unregister_function(struct rmi_function *); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 6755dd66d62f..aae4a9bb76fb 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -872,9 +872,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev, rmi_dbg(RMI_DEBUG_CORE, dev, "Initializing F%02X.\n", pdt->function_number); - fn = kzalloc(sizeof(struct rmi_function) + - BITS_TO_LONGS(data->irq_count) * sizeof(unsigned long), - GFP_KERNEL); + fn = rmi_alloc_function(rmi_dev, pdt->function_number); if (!fn) { dev_err(dev, "Failed to allocate memory for F%02X\n", pdt->function_number); @@ -884,8 +882,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev, INIT_LIST_HEAD(&fn->node); rmi_driver_copy_pdt_to_fd(pdt, &fn->fd); - fn->rmi_dev = rmi_dev; - fn->num_of_irqs = pdt->interrupt_source_count; fn->irq_pos = *current_irq_count; *current_irq_count += fn->num_of_irqs; @@ -894,8 +890,10 @@ static int rmi_create_function(struct rmi_device *rmi_dev, set_bit(fn->irq_pos + i, fn->irq_mask); error = rmi_register_function(fn); - if (error) + if (error) { + put_device(&fn->dev); return error; + } if (pdt->function_number == 0x01) data->f01_container = fn; -- 2.54.0.545.g6539524ca2-goog