From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 DCD1F381AFC for ; Fri, 10 Jul 2026 19:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783710750; cv=none; b=uqvCOqc44y9sQ4PhKIGePgid1TzdoEO6/mTYrKvV291TIYpns+1oGLG/sywLu9l41XDySv9sBRcXVNWiDXZNd8WTFKvX9Lk1P8jU6LN06zoA8DH2so6Cai5XYCPP64Fu/tJhE1suahIJOg9ZpoR1Ygd/JRqY9VgRNJYndvfBm7E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783710750; c=relaxed/simple; bh=hN1BELHe0HzMVXZth/JdE+10ehzOn9zzJk1tjshEl80=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=iUrvTKrUssgdGXvB5B3uxl+PHMfiNQpKzoayvirEDdMtHMtmg4cUlQj48fr65mOtnjxPkqbZ/fLvB+oyWkOteZ3fUSZI7ZVruSAUEKpjMdEHxVtsyRYn9asJyddaJVW2XbWCkPC3J5hVy+E/TAn4JEjg4lfArj2XZwoI4iknnzA= 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=J1LtNuqk; arc=none smtp.client-ip=209.85.167.43 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="J1LtNuqk" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b021916bd3so607219e87.3 for ; Fri, 10 Jul 2026 12:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783710746; x=1784315546; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=UJQcbXWAh+kWYkQGfCOXff9Cmt1+z/g0OGZkizOIHnU=; b=J1LtNuqk6n8d5azrYoyjWTuWkZre6pMJYRBtmR8XgKtXx3qxqHLsbjCTPpM2zWt7pL Uow2mHww4Qvv9s+aABPfkgkgq8oMDlMWspNBrt0XLLUIF2X4Z79YKird1vGjqGcDTAc+ ufC/AY+HB98Ut5Z9ROm5U/7+XAeBaFjb1CeSz6we/bwS80MWfySJhB+KPVSmcS8Lh/lR 4x9Ap4+Lwndl+hPU0He0VxLzIPu744GwqaSAhd1tXY5xIFrb2rRwI2MANaspwam27ZMG Yv5bS0p2NfoX59qBsEwYQbmFlFfnQSljjzNwE/q+5wYTAi3HkmbWCQ0tvanCZTmmsyvz WRFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783710746; x=1784315546; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=UJQcbXWAh+kWYkQGfCOXff9Cmt1+z/g0OGZkizOIHnU=; b=aTWfEsG57m4JLQvgJ8/aRppQqmnyurXddWUBa9vTR457df5Lqe29Rx/HUa7d2mFHVC bxQ1kMS2+7DE3Tyi+snq0CRDahtLT9Oyr7Ec1D5nxyJlx3GJo11NaeJwpFwCW1TsPrWq VsA5NbWT+SKWSQtS5Y/frPIk3U8y0wumk+OVQwj4yU4/nih6UapXiq1dDLqUIZ3XIpPh d4cVUkVxsaNSil+1C07naCdBkmddFHhGDUYhxZFkt+8lth09rP7Ieku+ZxXPM86wrXFw VHxMYzK7YKWBcK9oB5QlPhdUlZ4q72k5KjFPjxq/jHOfGugHCEYTw6Tmadnk1OGPTUlW VN8w== X-Forwarded-Encrypted: i=1; AHgh+Rr5t/px7jX47+EGFHejNBv2li/bTb5QtPgMgCdYXsBHUyhRckg90MHNm54SkNMnOBneixrWLzwLT+REcTA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8JTWMywyW0pFsDSeoC2rhDtf271kVvLaQpozyTc/dnDR5i75+ bvGknU3iFYfy/+yCfLRAIBJEIClyDv3yynZZrSNYepYNah9o8fSmMOp3 X-Gm-Gg: AfdE7ckMhlB+MHGuWfMh+eznKz6yi9ZQ67Auzyvs6unK7vVp1H854tBWmQNChBAU30i V6XTtULWqzy9Id6/9jEg8y6iIFM7hfZJZvLLnJlUcH1kbd7ktqcqrmjOHeqaPzBBrMtP/Rz4M9k 3B3qcmy9D9z2kwm5HMkqR67MSCPkdpn18V1vC5AuGImIO6r3/qlAsF4ywpa7izmoI5yQubnoNR4 qZ1TPPTX1MmOW/b94t+p1gD1f1y2DGKxX1bvGaywF3SlZpQRZKup9tk3uSsp+4rQa/OiYDvrwMD bCD1tQ3FPNCUW8uQC3QrIRzZutapsJmOICxsb+Zz+Q2m/gNBwqDSEBGrly11bRYqhg7+6log5Hz HEY2zJD+GVFikdQQSMAC5AF4pWirSNuBg96QV6DsZwGVu/Z6yfOGsCMQhNc5M6d7Rt1X5MRf3XZ 0rvO2F3nSgXm5AJmyZaQtiz72db/+5fkZQY7YOVf3N1MMVvR9llnKvuZLJQot+v8X6AkxcXRX/Q rWIC2s= X-Received: by 2002:ac2:51d1:0:b0:5b0:bc3:dc05 with SMTP id 2adb3069b0e04-5b02369c7cdmr76618e87.40.1783710745968; Fri, 10 Jul 2026 12:12:25 -0700 (PDT) Received: from debian.localdomain (95-25-158-125.broadband.corbina.ru. [95.25.158.125]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b01ca9dd41sm807683e87.48.2026.07.10.12.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2026 12:12:25 -0700 (PDT) From: Igor Putko To: gregkh@linuxfoundation.org, marvin24@gmx.de Cc: linux-staging@lists.linux.dev, linux-tegra@vger.kernel.org, ac100@lists.launchpad.net, linux-kernel@vger.kernel.org, Igor Putko Subject: [PATCH] staging: nvec: kbd: replace global state with dynamic allocation Date: Fri, 10 Jul 2026 22:12:21 +0300 Message-ID: <20260710191221.2820-1-igorpetindev@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Remove the global static 'keys_dev' struct to allow multiple device instances. Allocate 'nvec_keys' dynamically per-device using devm_kzalloc() during probe, and fetch the context using input_get_drvdata() and container_of(). Signed-off-by: Igor Putko --- drivers/staging/nvec/nvec_kbd.c | 40 ++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c index d2b91318f..4b61aebca 100644 --- a/drivers/staging/nvec/nvec_kbd.c +++ b/drivers/staging/nvec/nvec_kbd.c @@ -35,19 +35,17 @@ struct nvec_keys { bool caps_lock; }; -static struct nvec_keys keys_dev; - -static void nvec_kbd_toggle_led(void) +static void nvec_kbd_toggle_led(struct nvec_keys *keys) { char buf[] = { NVEC_KBD, SET_LEDS, 0 }; - keys_dev.caps_lock = !keys_dev.caps_lock; + keys->caps_lock = !keys->caps_lock; - if (keys_dev.caps_lock) + if (keys->caps_lock) /* should be BIT(0) only, firmware bug? */ buf[2] = BIT(0) | BIT(1) | BIT(2); - nvec_write_async(keys_dev.nvec, buf, sizeof(buf)); + nvec_write_async(keys->nvec, buf, sizeof(buf)); } static int nvec_keys_notifier(struct notifier_block *nb, @@ -55,6 +53,7 @@ static int nvec_keys_notifier(struct notifier_block *nb, { int code, state; unsigned char *msg = data; + struct nvec_keys *keys = container_of(nb, struct nvec_keys, notifier); if (event_type == NVEC_KB_EVT) { int _size = (msg[0] & (3 << 5)) >> 5; @@ -70,11 +69,11 @@ static int nvec_keys_notifier(struct notifier_block *nb, state = msg[1] & 0x80; if (code_tabs[_size][code] == KEY_CAPSLOCK && state) - nvec_kbd_toggle_led(); + nvec_kbd_toggle_led(keys); - input_report_key(keys_dev.input, code_tabs[_size][code], + input_report_key(keys->input, code_tabs[_size][code], !state); - input_sync(keys_dev.input); + input_sync(keys->input); return NOTIFY_STOP; } @@ -85,7 +84,7 @@ static int nvec_keys_notifier(struct notifier_block *nb, static int nvec_kbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) { - struct nvec_chip *nvec = keys_dev.nvec; + struct nvec_keys *keys = input_get_drvdata(dev); char buf[] = { NVEC_KBD, SET_LEDS, 0 }; if (type == EV_REP) @@ -98,7 +97,7 @@ static int nvec_kbd_event(struct input_dev *dev, unsigned int type, return -1; buf[2] = !!value; - nvec_write_async(nvec, buf, sizeof(buf)); + nvec_write_async(keys->nvec, buf, sizeof(buf)); return 0; } @@ -107,6 +106,7 @@ static int nvec_kbd_probe(struct platform_device *pdev) { struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); int i, j, err; + struct nvec_keys *keys; struct input_dev *idev; char clear_leds[] = { NVEC_KBD, SET_LEDS, 0 }, enable_kbd[] = { NVEC_KBD, ENABLE_KBD }, @@ -115,6 +115,9 @@ static int nvec_kbd_probe(struct platform_device *pdev) true }; j = 0; + keys = devm_kzalloc(&pdev->dev, sizeof(struct nvec_keys), GFP_KERNEL); + if (!keys) + return -ENOMEM; for (i = 0; i < ARRAY_SIZE(code_tab_102us); ++i) keycodes[j++] = code_tab_102us[i]; @@ -138,14 +141,18 @@ static int nvec_kbd_probe(struct platform_device *pdev) set_bit(keycodes[i], idev->keybit); clear_bit(0, idev->keybit); + + input_set_drvdata(idev, keys); + platform_set_drvdata(pdev, keys); + err = input_register_device(idev); if (err) return err; - keys_dev.input = idev; - keys_dev.notifier.notifier_call = nvec_keys_notifier; - keys_dev.nvec = nvec; - nvec_register_notifier(nvec, &keys_dev.notifier, 0); + keys->input = idev; + keys->notifier.notifier_call = nvec_keys_notifier; + keys->nvec = nvec; + nvec_register_notifier(nvec, &keys->notifier, 0); /* Enable keyboard */ nvec_write_sync(nvec, enable_kbd, 2, NULL); @@ -165,12 +172,13 @@ static int nvec_kbd_probe(struct platform_device *pdev) static void nvec_kbd_remove(struct platform_device *pdev) { struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); + struct nvec_keys *keys = platform_get_drvdata(pdev); char disable_kbd[] = { NVEC_KBD, DISABLE_KBD }, uncnfg_wake_key_reporting[] = { NVEC_KBD, CNFG_WAKE_KEY_REPORTING, false }; nvec_write_async(nvec, uncnfg_wake_key_reporting, 3); nvec_write_async(nvec, disable_kbd, 2); - nvec_unregister_notifier(nvec, &keys_dev.notifier); + nvec_unregister_notifier(nvec, &keys->notifier); } static struct platform_driver nvec_kbd_driver = { -- 2.47.3