From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 52DC7199235 for ; Mon, 30 Dec 2024 19:09:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585786; cv=none; b=ugdRsO5e+B8tCcYtgvhrw4b60u6eHVK8W+OWsM/CE9J3a1HKydfCqaqpB1A0t+1net+gK6aoyqloqdfah5p0KlGCVrIrJ7QznRlKDaffZMNRZpOCoImBCgjO+zIsLQyX9Js5qHQ5CnGFqyXEe/eo0fILNZxqvcp9TaN+EHhKuio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585786; c=relaxed/simple; bh=inEhfls+rd5SvLmjK1jyBzMZzSokzL7jOsUV1xrZHjI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CtdeyK7svKFkvh5VhSLQmsXlFLd1IBv4FtstFhUInIRpw0t5nNVKnsJvz/88zGjIw85wR9N2/gq3F2W3F8BMvh3hu/IHIelnU+6VHczjdBWDRUU67GT/VAf+cMrhTq6So4gozT79yj7KUkNIsVdRkxmgPeGgdZJaZLY9b3I0Mqo= 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=GmV+Do6v; arc=none smtp.client-ip=209.85.214.175 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="GmV+Do6v" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2161a4f86a3so11256445ad.1 for ; Mon, 30 Dec 2024 11:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585784; x=1736190584; 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=IAsHzXTlNC3UmvdMU6pJZD9xh8CT7SmzOJpjswVS2/Y=; b=GmV+Do6vi8AeunZqO2IH/ny1ElYY4NRd0pnx6Wc636aGiJdsBgiB0eKoiJOikEP1fG EfQxR4jF6www9yeahl2Dtrw2WEvE5ENZhYRdOOrt0PBY39uCwjD0pvN9OBqJ432qABGk /tUIhtU95gYBTl0GjvfZ8Ep+5SY45bqfy3ooUaKS3A7LA0rbiCc2Yo8ufIaZPDE8lCwr ++1P40/MkrxjtQM3IR1Uivqf8So1cepQcFRTnZGcI4S4MnjirehaKvCwZnu6NoJgTtVR 9V5ErNWp9iqgLEyZRtYuz+ybctrF+BBnviaUDLyq48qqMaaEwBQt491bfJlmc93pvFkb 5p7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585784; x=1736190584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IAsHzXTlNC3UmvdMU6pJZD9xh8CT7SmzOJpjswVS2/Y=; b=Nstgt87mU4cPFX7mHNymlROjE3dkoXy0jmmrsj9CSX1FjfQijmWPCoh3abz9gVh04G RQQDTd6PbwfujwSXBGH+yXYJKKWq4Onuu5kLl2PlfBQN6taSAleYd3ypA6lG2/uJpzMF B7duonM0S/sourZa0k1HduJEEcv20xPmGi/mBH/M2Aq7fFgGYFaRQuqOMBIDlMr0hQ9/ gxl5lzYSecwJ9CzNRRLnAczWUCAX3hmJPU9zVVUMYU2mfRBDh7Uv+2LLI1LLhAJqOZlM Qw6d2yPHYknyfodEQkjrGwjKgpUf7ndDMnSAPy0pbNOBc7tHFyQ0Y078n1H7NKF+YqPG rfnw== X-Forwarded-Encrypted: i=1; AJvYcCWdPm3onOvcqmf/V7KCPV+LwwYOIQi6OzhEwK14yh3YPLgFy3eRJo2k+HQuhNv9B20CZ3+qYtyzC30or8I=@vger.kernel.org X-Gm-Message-State: AOJu0YxUABVE2vLLrR6Bwd8o/AQLeos3I4M/Slo1AaF7j7f/kQgIF9CI Uq3QKolBaqdUSV+fUcxJPDvPRxLyi9oX43IwgfYViV7N0hQBQ4W/ X-Gm-Gg: ASbGncvaNsM57nkEu+Q8wATgeRGBhKOOtKB3kn0MjnxQ2DhCstZdx8158jRWk3Glwa8 0lFu/jBft+nV4c4g2gvegKAIfJv65j0KzPyqIvsd/PIrNvL6dgb5C3QPUus/rUV0kGdqfgQtWUl UHCxTlWNWXKygaVmPyahT7M3KaiVxO2t94fd98K+2gdIU42UFHoiBfn4DA11RwTxQHLYDn5Lgsa 3DTL1zhD7IWjC07JHhz5kLNICWuP5FOs1FZJUDDF933fe5YKLahowo= X-Google-Smtp-Source: AGHT+IG2Am3uEs46mNP4pINCD1qD41B8MIb1NgNJxANN4KQ/6lMIiTFpYbJkGodGiLYXkHYQG7r4lw== X-Received: by 2002:a17:902:c402:b0:216:4339:70f with SMTP id d9443c01a7336-219e6eb45ecmr178090045ad.8.1735585784580; Mon, 30 Dec 2024 11:09:44 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:09:44 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 01/15] staging: gpib: Modify gpib_register_driver() to return error if it fails Date: Tue, 31 Dec 2024 00:26:21 +0530 Message-Id: <20241230185633.175690-2-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail if kmalloc() fails, but it doesn't return any error if that happens. Modify the function to return error i.e int. Return the appropriate error code if it fails. Remove the pr_info() statement. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/common/gpib_os.c | 7 ++++--- drivers/staging/gpib/include/gpibP.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/c= ommon/gpib_os.c index 405237d8cb47..07795df3b721 100644 --- a/drivers/staging/gpib/common/gpib_os.c +++ b/drivers/staging/gpib/common/gpib_os.c @@ -2094,18 +2094,19 @@ void init_gpib_descriptor(gpib_descriptor_t *desc) atomic_set(&desc->io_in_progress, 0); } =20 -void gpib_register_driver(gpib_interface_t *interface, struct module *prov= ider_module) +int gpib_register_driver(gpib_interface_t *interface, struct module *provi= der_module) { struct gpib_interface_list_struct *entry; =20 entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) - return; + return -ENOMEM; =20 entry->interface =3D interface; entry->module =3D provider_module; list_add(&entry->list, ®istered_drivers); - pr_info("gpib: registered %s interface\n", interface->name); + + return 0; } EXPORT_SYMBOL(gpib_register_driver); =20 diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/staging/gpib/in= clude/gpibP.h index 5fc42b645ab7..d0cd42c1a0ad 100644 --- a/drivers/staging/gpib/include/gpibP.h +++ b/drivers/staging/gpib/include/gpibP.h @@ -17,7 +17,7 @@ #include #include =20 -void gpib_register_driver(gpib_interface_t *interface, struct module *mod); +int gpib_register_driver(gpib_interface_t *interface, struct module *mod); void gpib_unregister_driver(gpib_interface_t *interface); struct pci_dev *gpib_pci_get_device(const gpib_board_config_t *config, uns= igned int vendor_id, unsigned int device_id, struct pci_dev *from); --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 D5A4519ADB0 for ; Mon, 30 Dec 2024 19:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585789; cv=none; b=g5vCb1PLjq0rEHJVgRwWArUOAWCfsa8rzoWm910/htFQsCJTgm/lCJtfGYKYCP29w19TtT24K81fdSIni8AjFBpF2PYdHxd8qjyu6egUg1rGct1ZFsPvFMmCXFSaK5OF5C71ATANPPSYFpnXjW6kTjH85s+5te4JDiZ29KIF4sc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585789; c=relaxed/simple; bh=hRTC7gQvIpANVJnSEuSyOS2BqBnaStyxOCR43evHXn8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gplDqnKawcMs8HRWulzN7qd7ViCUvWxK6PNHmfjPaBvf3gwBuUeQGgqkBWM4sblUJmxouwHKAJDgK6uxS29L2wx/5gMWdLT1DD/+f1XOqK/VyabkXeD1J2JMBQK2U+kAFh9uuT4etvDBbhEfxe98SxLCCVIFbEL2PuvEI29ZDug= 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=J+Jm7AId; arc=none smtp.client-ip=209.85.216.41 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="J+Jm7AId" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2ee94a2d8d0so1859099a91.2 for ; Mon, 30 Dec 2024 11:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585787; x=1736190587; 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=mhujBAMi711rX4sFChpTBKWquP7CuLAwL+h0gUNEzis=; b=J+Jm7AIdgD9cUFhBO15eoi7ZlDD+OyEOLyBYEjwliveeCTYJkeHHWYGJUMufMq28qS eWQt9AGVDS51PYcHMd4tX/Suc8GWHjicCF3GaXpGy1oWfuisbiBs1vIvP0ED3+sVjJf3 bpW9MqXMZ2DFVvkhS7gcm2HSdJn1oMkdgzYfAoG9MvedmSLEkJ9TEhGT1nLPri3ITM9i /TTnptOykDYUUarnHc5j1dAeQOZ9rbwiPV9ivjpwCabNSkB2/gnsi1cnkY3hcfBSH0/G LpzO3E8izxC/RQWWczlCVaHB5IydUwq0StPq1dP7gwD1BijrfykRnbAzPikDkIGcDMwX trxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585787; x=1736190587; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mhujBAMi711rX4sFChpTBKWquP7CuLAwL+h0gUNEzis=; b=OF95F2HJRQYuKDWF+vu2nNF4ywbB7LZf8dlV/BxNdejCEkx1q79ibuf3wFe+jC7cCC 3cWY/Rr3RUvrMFD4u7zgjsndXZfmMJygGb/zZjuOv9u/RhHQIgb/FwAKX7bD+lGLGdXn UMSkt1z0plRVEfX4PQE84KfyBHvKM3XsbIuI1QgxVB5kMk91IZjW0hHGEM+HTfQ82vSL H5sbnY4/QnMw7CdNpKLKuq8oXGaTP1CQ1zr4RoY2/CeZ8N9QbVE+xm2avanUjfcz2f5+ Ynl4BZCzINbLzuEeLODiPd510exX0pUk349JP0J4zLxdCY9xMYo1r704DpBXwCntB0KT rwMQ== X-Forwarded-Encrypted: i=1; AJvYcCUeueR7TG11OZwR4II0Pij50WbM2FEX1jIG1LjXrUt5mPDYVd9YwchK33/nx0aMO80yA66IGFx8nXnfT24=@vger.kernel.org X-Gm-Message-State: AOJu0YyBfYrc8uqVI/SIz81Vu8aKjUiORKJFqWHUyNn+3FSS3RAmOwf7 t9J+mR+iQDWGfkEMhtUTxwznCbw8Pxq0SoIsTBqT8IwOo8/pbxr12bxt7g== X-Gm-Gg: ASbGncsb9aI8GuLuEHyoX7ciNnZKovKV3EKkUHxCKgZ6WeqQw3gVqNnLdESsUVLrHsr XB1cTHWIixtIrfj8/Z/oVgDYnNybT3V8u359NeRG2O+XP0TSF+8IozgGMYPzzgAOarakO0fmUNp 2bqLcOQQ8nY7tYupt0Z0uGceeWu+1WleKTgHmvzzAI+NJhLAfn1icziCARN/e3PYgUw7YjCr7U6 NkM0N6GT3V6EPb2dcWhea6YOvwB2R5OR7OeiD/LBOhsGDS9SlKut68= X-Google-Smtp-Source: AGHT+IF9/qByqpXKB+Ti9k6vfHKX4HuRQ4HiRR8hZaip/iJ7Kkkyt/0UlDlW6w0S3pRMjLiWcZPoxQ== X-Received: by 2002:a17:90b:2f46:b0:2ee:a558:b6bf with SMTP id 98e67ed59e1d1-2f452efc09dmr20433792a91.8.1735585787122; Mon, 30 Dec 2024 11:09:47 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:09:46 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 02/15] staging: gpib: agilent_82350b: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:22 +0530 Message-Id: <20241230185633.175690-3-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail which can result in semi-registered module. In case gpib_register_driver() fails unregister the previous gpib and pci registering functions, return the error value. Add pr_err() when registering driver fails also indicate the error value. Signed-off-by: Nihar Chaithanya --- .../gpib/agilent_82350b/agilent_82350b.c | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers= /staging/gpib/agilent_82350b/agilent_82350b.c index 53006d0cc79c..e9c1f0100b2a 100644 --- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c +++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c @@ -910,13 +910,30 @@ static int __init agilent_82350b_init_module(void) =20 result =3D pci_register_driver(&agilent_82350b_pci_driver); if (result) { - pr_err("agilent_82350b: pci_driver_register failed!\n"); + pr_err("agilent_82350b: pci_register_driver failed: error =3D %d\n", res= ult); return result; } =20 - gpib_register_driver(&agilent_82350b_unaccel_interface, THIS_MODULE); - gpib_register_driver(&agilent_82350b_interface, THIS_MODULE); + result =3D gpib_register_driver(&agilent_82350b_unaccel_interface, THIS_M= ODULE); + if (result) { + pr_err("agilent_82350b: gpib_register_driver failed: error =3D %d\n", re= sult); + goto err_unaccel; + } + + result =3D gpib_register_driver(&agilent_82350b_interface, THIS_MODULE); + if (result) { + pr_err("agilent_82350b: gpib_register_driver failed: error =3D %d\n", re= sult); + goto err_interface; + } + return 0; + +err_interface: + gpib_unregister_driver(&agilent_82350b_unaccel_interface); +err_unaccel: + pci_unregister_driver(&agilent_82350b_pci_driver); + + return result; } =20 static void __exit agilent_82350b_exit_module(void) --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 60EF519C57C for ; Mon, 30 Dec 2024 19:09:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585791; cv=none; b=AQYgdeVDf/vjsMM2b+yqYCM40wUfHEq8T060swaCb8KU+7w5CyfsZCwp6uEd0WaCku44lhKDcumsULriCW1hnYEN99mbgeweUaLRumO6uPOHImoVHAqTHVh3bY23XuNK3QkU/oNc5/id3+j3tlLJIVftlmNvNb20ugKZ5p61jY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585791; c=relaxed/simple; bh=S7a8wX9Yexy2sv2AYTieFKxnvfJmcnoAKN16sspLSGg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gV7rh1AVvBzpK6Gb8XZdSI20DqP0AHgQQirslsGO7mrfuf3NKUTbWOKBJFDCbS06Fv1F603PCmP6xjQ8M3Pc5kYlM4ulJuW4u52fsifxOXDwAjdrFcRBcjc0BIG1Tt5WsRmQtzMosDT+GxYz6tDbeTdPtqe1Xp4q9ikREWYgngw= 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=Hvr6bo+5; arc=none smtp.client-ip=209.85.214.179 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="Hvr6bo+5" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2161a4f86a3so11256575ad.1 for ; Mon, 30 Dec 2024 11:09:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585790; x=1736190590; 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=eLKyEu22nnn6LeqdD3A+og9HGlmTSWryEARLiqriBEs=; b=Hvr6bo+5Yq3U+pUrtoFu0cqtJt875PZMUweqR/k7qBGXMVSn0fn0khfb04ir19NUSj NQ7fxVEaFrNn+OvVttGFg6Ed5B7FeU4XxUyd/lTsgFmyjA+6PAM6HXmEc/9qEelw9JIE Md8QhweAJHWl9+K2PNLqaajsRKnWyAtWAfTu8YLSZ2hA/lEZdjKzX+j/kENe8GjbtQ4h FEx0f9ABTVCa+VJrynWcLC8cTTUx5og283m+k5l8aQuusy8rx+UvxtAppmzRpK4BQq0w or3MzlFxyT1T5lGQyefdKPussxMiGWNYW7YTN3E1Ji8l/D7HSsX8DbpOLaRkPKvcv3n1 7+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585790; x=1736190590; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eLKyEu22nnn6LeqdD3A+og9HGlmTSWryEARLiqriBEs=; b=ZLQRkDNgzwmFACRT1l167PndPclwfR0wx0xZq2UxqLW3um6ufScteEzdom4FhZ8o4D BugWwH3d9icRpNSV1xR5gG4MP/7MJoBd6vxeEnES+jN5v59akcncxlkvAZTIPf2zpMKa tF2Aw+Iu/MHBsfJBC0GdRpWd/VhaBO5Z9vb54s4RWtNC+QRl7A+Hfc7OcbQ7HluyuIZm hqa73prbwtziG/TunRVuTITLgyWBYDuCGfshZamN2OtZS2uAG1i4GvoMQ0AplmY8iiqm btsDwhw89+zXRk5TykpxHJi/Hf6ErXqP72X5MpUqi9iNhSdk8Be1sZyz3o6eEFW3oM5s motw== X-Forwarded-Encrypted: i=1; AJvYcCV7gTpcoCPuJANz3t80KcRW0laoPzlAJv1B2CUxgRYpg9hbANZRVBd1t8CaVBmODo6ACYdZcCfDviUcZk8=@vger.kernel.org X-Gm-Message-State: AOJu0YzutsA2KRcwxoSxZJ2exG2vx8sYptAn7kJKpBJjojSByTmhu5VV 28H4Nc1IKqv9L5PjkX7FSuO5HX0bZTKpR9J7hhwjGiYMTOGzmPZW X-Gm-Gg: ASbGncv6yD+SkV9T2caCFxwNvNUl7Ods8WVWo+PrZFFL6ZCXIFJXJVM9+1hT4dvRzZC YCPMnBZFwk8rYEnxKeloESsKLt+RTWywQ/zn5L9M/pJvin3oe6IzQdo0nWSwkUVXCwmrm8aC2P/ lSxkBbiQmfhj3hd8xhXgHX6IqSiCuJp4kV2OG5fMrD4I6mKjyi4P7OkdIWc4QT/T4B80bALMYBu oCu7bEKV9bOJjsXBd5VeKoos/CXxKCXxx2UYPyJnZLLe2NiTdEQPd0= X-Google-Smtp-Source: AGHT+IETBKn1g7dh/TqzXpdQ9VNn+VSziUBcWMQBOqCxTYoBaRx9cGA1TzG/PUhWcDrlHOhE7tfxHQ== X-Received: by 2002:a17:902:f644:b0:215:94ef:6071 with SMTP id d9443c01a7336-219e6f2707amr187942205ad.14.1735585789667; Mon, 30 Dec 2024 11:09:49 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:09:49 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 03/15] staging: gpib: agilent_82357a: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:23 +0530 Message-Id: <20241230185633.175690-4-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The usb_register() function can fail and returns an error value which is not returned. The function gpib_register_driver() can also fail which can result in semi-registered module. In case gpib_register_driver() fails unregister the previous usb driver registering function. Return the error value if gpib_register_driver() or usb_register() functions fail. Add pr_err when registering driver fails also indicating the error value. Signed-off-by: Nihar Chaithanya --- .../staging/gpib/agilent_82357a/agilent_82357a.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers= /staging/gpib/agilent_82357a/agilent_82357a.c index bf05fb4a736b..261fb6d2e991 100644 --- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c +++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c @@ -1691,12 +1691,24 @@ static struct usb_driver agilent_82357a_bus_driver = =3D { static int __init agilent_82357a_init_module(void) { int i; + int ret; =20 pr_info("agilent_82357a_gpib driver loading"); for (i =3D 0; i < MAX_NUM_82357A_INTERFACES; ++i) agilent_82357a_driver_interfaces[i] =3D NULL; - usb_register(&agilent_82357a_bus_driver); - gpib_register_driver(&agilent_82357a_gpib_interface, THIS_MODULE); + + ret =3D usb_register(&agilent_82357a_bus_driver); + if (ret) { + pr_err("agilent_82357a: usb_register failed: error =3D %d\n", ret); + return ret; + } + + ret =3D gpib_register_driver(&agilent_82357a_gpib_interface, THIS_MODULE); + if (ret) { + pr_err("agilent_82357a: gpib_register_driver failed: error =3D %d\n", re= t); + usb_deregister(&agilent_82357a_bus_driver); + return ret; + } =20 return 0; } --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 72E6919CD13 for ; Mon, 30 Dec 2024 19:09:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585796; cv=none; b=VrVhu/QA70UUmbkLcCAecYFPBIbllJE2aLVGbmw2MvPz8PA9Hq0e0pt9A92rlaExPRPatHGVyz+X/8iDdMQEYjzf9jS7TaI9nybnJd7xVNTHjmjndbI3q6Xu2OzweuxkFtWGWMky/hWwqs9ZT+wqStcR6KcxFO+Y2PS6zwyLoxQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585796; c=relaxed/simple; bh=CQeDTHpEokis/9sOyp7wowTDF0BeyBtYFlHbHL8DiVM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jLQnmqEu5s8S87NqQvDypTRCzYCJxOl+YSACTB3sSTTdWnl+KYpmLaBhfGZnJu+6n9MzrwdY/1vsg5I56Mp8YN4yQtR12hQLazUVnmNPNdQkB7NlUbTTFDEKrmOrFrhKUcYMTbizJnJ0SwzRulPLoY+FbiiFvBtmvPDk0v7Hzqs= 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=N/ACGcSB; arc=none smtp.client-ip=209.85.214.177 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="N/ACGcSB" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2162b5d2e1fso15350965ad.3 for ; Mon, 30 Dec 2024 11:09:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585794; x=1736190594; 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=Xsa2/8UPc8Me8x5Dx2SCikAH5NYtOL4yIBVFykWklUE=; b=N/ACGcSBztNeHfMHkB5/3+rdDJnQpWt/erGtQCbiRuP/tiAW38e5lDVgprS9fFrgEA 0EklLwFO4yR31tScl/7G4YX5vrgvazvbcGejlN5ToSHj3s6uMRd0LHxOovQ6ICk54nno o5BtOU8K1mWDnPAt+3QZtVvF5dlk3hyc2NXuhVYGmb+SyNGlUyXyrnVr9LKet9MZIKH4 kre+nOt3asu82kdoQfpauDNTg//e/P5V2OwLVV2sp2+z1PUaDqtXLjTNNyLKC0zEIrPj 8fndxZ+n6lJqc2H5tvgJtLI7NHTVPfUCKDiHUnIXws2KDtxua/SOoNFv3dQsPTT2RWzP ftqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585794; x=1736190594; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xsa2/8UPc8Me8x5Dx2SCikAH5NYtOL4yIBVFykWklUE=; b=YAXNc0/qEjPpW5uj0Em3gKCmI7GoNowDFWA9RKC1mnicxZ6eIAp3zuZywtT9YsDWTp xAPiw1jIpqUznm67D1CJg8bndycHa+d1SWNMDTRsIf/+lds0waBAHqzNSqVCSGzxRFH+ 7arFC1pJqfY+hJSjtRsvRM+SNwBxGYnG316NtyCCxDEt2u4/3LkRjcUsLdezVW7vH3S+ vWJu4qyaZxFzxLvjOecFT/HviuwruorCriCsDuPSK3OtfvCo1OgvYhUNL3IW0myJe9FD +B0zt4pq/kDAB9vJTKaCdcXUwl/OsvT3DNo8ILwt2U3rs7SH86nyqeSZDroKQuQOyvxG mfSw== X-Forwarded-Encrypted: i=1; AJvYcCXQ4CWHF0BCnqrEt2r6qo6QLXBCK5VJcrD61ukrtIqtb640YrWbONA1TK/pW5x3MerixIfsySgnk6yXJdU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/sv4390vKQixPdOAvNky1ShozxPwf2U+so1V+nFBoszLg/dRX OSO21KUKU661MFIIxiTI/5mh8Kf8Y/PdRkdSkKYOKstlc+t723+h X-Gm-Gg: ASbGncv+sdx/Lqy/4Nn7P64QOsj8fEA9FzdwpTHHK7uJHSTLTsfqA9Dgs3aOMXtrIVX fiv8ATp5O3MubItEl7MfJXGfR030Lfcccybf2OMXnxfhC9Y2BidKsG9fPeJgWo9E4Br3agkKEji C2qV3L0gRIY6cgn4/IlqlgIRB5uvPXICAiptZMpfTQoB211FjKFvhHexQm0lYn6XF8jDpWn28Na ZwBLSEz4G3wJxeh+1CIo1G8PZgB8jcMMbtIBRYrxtecNoColZOwe48= X-Google-Smtp-Source: AGHT+IEgWZ8CFGHO61/QnxIFYs8noH2nN7yjt92e7XABnMDSgY7V6wf4kSGKGXJrt4Axkvc8tI4UwQ== X-Received: by 2002:a17:902:f542:b0:215:b8b6:d2c4 with SMTP id d9443c01a7336-219e6e9a23amr190536675ad.4.1735585792238; Mon, 30 Dec 2024 11:09:52 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:09:51 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 04/15] staging: gpib: cb7210: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:24 +0530 Message-Id: <20241230185633.175690-5-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function cb_pcmcia_init_module() can be replaced by calling pcmcia_register_driver() directly. The error value from this function is not returned and the previous registering functions are not unregistered. The function gpib_register_driver() can fail and similar to pcmcia_register_driver() function failing, the previous registering functions are not unregistered. Replace cb_pcmcia_init_module() with pcmcia_register_driver(). Unregister the gpib and pci register functions if the subsequent gpib or pcmcia register functions fail and return the error value. Add pr_err() statements to indicate the fail and also the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/cb7210/cb7210.c | 116 +++++++++++++++++++++------ 1 file changed, 90 insertions(+), 26 deletions(-) diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb= 7210/cb7210.c index 63df7f3eb3f3..45a54219ea6d 100644 --- a/drivers/staging/gpib/cb7210/cb7210.c +++ b/drivers/staging/gpib/cb7210/cb7210.c @@ -1351,12 +1351,6 @@ static struct pcmcia_driver cb_gpib_cs_driver =3D { .resume =3D cb_gpib_resume, }; =20 -int cb_pcmcia_init_module(void) -{ - pcmcia_register_driver(&cb_gpib_cs_driver); - return 0; -} - void cb_pcmcia_cleanup_module(void) { DEBUG(0, "cb_gpib_cs: unloading\n"); @@ -1506,32 +1500,102 @@ void cb_pcmcia_detach(gpib_board_t *board) =20 static int __init cb7210_init_module(void) { - int err =3D 0; - int result; + int ret; + + ret =3D pci_register_driver(&cb7210_pci_driver); + if (ret) { + pr_err("cb7210: pci_register_driver failed: error =3D %d\n", ret); + return ret; + } + + ret =3D gpib_register_driver(&cb_pci_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pci; + } + + ret =3D gpib_register_driver(&cb_isa_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_isa; + } =20 - result =3D pci_register_driver(&cb7210_pci_driver); - if (result) { - pr_err("cb7210: pci_driver_register failed!\n"); - return result; + ret =3D gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pci_accel; } =20 - gpib_register_driver(&cb_pci_interface, THIS_MODULE); - gpib_register_driver(&cb_isa_interface, THIS_MODULE); - gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE); - gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE); - gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE); - -#ifdef GPIB__PCMCIA - gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE); - gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE); - gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE); - err +=3D cb_pcmcia_init_module(); + ret =3D gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pci_unaccel; + } + + ret =3D gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_isa_accel; + } + + ret =3D gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_isa_unaccel; + } + +#ifdef GPIB_PCMCIA + ret =3D gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia; + } + + ret =3D gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia_accel; + } + + ret =3D gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia_unaccel; + } + + ret =3D pcmcia_register_driver(&cb_gpib_cs_driver); + if (ret) { + pr_err("cb7210: pcmcia_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia_driver; + } #endif - if (err) - return -1; =20 return 0; + +#ifdef GPIB_PCMCIA +err_pcmcia_driver: + gpib_unregister_driver(&cb_pcmcia_unaccel_interface); +err_pcmcia_unaccel: + gpib_unregister_driver(&cb_pcmcia_accel_interface); +err_pcmcia_accel: + gpib_unregister_driver(&cb_pcmcia_interface); +err_pcmcia: +#endif + gpib_unregister_driver(&cb_isa_unaccel_interface); +err_isa_unaccel: + gpib_unregister_driver(&cb_isa_accel_interface); +err_isa_accel: + gpib_unregister_driver(&cb_pci_unaccel_interface); +err_pci_unaccel: + gpib_unregister_driver(&cb_pci_accel_interface); +err_pci_accel: + gpib_unregister_driver(&cb_isa_interface); +err_isa: + gpib_unregister_driver(&cb_pci_interface); +err_pci: + pci_unregister_driver(&cb7210_pci_driver); + + return ret; } =20 static void __exit cb7210_exit_module(void) --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 7D5DE19C57C for ; Mon, 30 Dec 2024 19:09:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585796; cv=none; b=PRvYx6TC3X0eQZgo0NCrwWVFjHkPouYCBSXDR/yUrXeGujL0GV9zy/LNSTS9fgBygngl4GVvfCHUsX9Hh9HXEPsQ2IuFpr79Byq9npgGQtLU3MO5l6f2Xiz7Cmr5HN3CANylvluevMKHKKyPIQV2Tnw5OE9Jm82tshkWHz8jxWo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585796; c=relaxed/simple; bh=+/U6TP0u4+L0ticmjRX+UP8OM1S6krGy8xWAWPiUEKE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=b9RUpsfSkSNe4prMSOrpYwdOmuCgTjtsK9Q8AWRRYUbLRIf6Hn5dKeXJ6yhVx3g+gvoX9BXHuxh2iZWLS26Tr5nnt+GUmhHxD26Nq/GyWo3kOGyyv2Pp6tb0xj4zCxcPkL8X5UW02mNGENbXx5kGcOUI8vRtMjSfx2UzhAVHfcM= 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=BifKCEMs; arc=none smtp.client-ip=209.85.214.178 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="BifKCEMs" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2162b5d2e1fso15350975ad.3 for ; Mon, 30 Dec 2024 11:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585795; x=1736190595; 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=oT5isU+QbLuiUavKN59sWsElBo1xMBVRc25NaB2S0Ro=; b=BifKCEMs5p50iozoN8Dxwh+snSd+Z2xTq3eOMKLMKScrU+A8iMaVXX0Y/xHbTbUU+N hfyxDM3TYCoB05yytR/d93eC2/UjZ9y9020NG14XU+zEh1yTISq2OQ1ePU/59hL7v/h5 VspKMY2oJ2crUa7QVm8zLTDUN36C0eA+I+t3xd8iWgL1Yk2ftksFN2TdLrLcSkRmh1pA 6tuoTjmQd871Qc9As9BQ4wknZKG6E0bQcQUWFRAuIxqkgi5X894biORpF6LSjcl765xZ jlNAdEOcGTVgJKzfEijJcwzid1h1IgjtdgEGp735AaDgSDFIl00xNgrpt/KePg+5gaej xiDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585795; x=1736190595; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oT5isU+QbLuiUavKN59sWsElBo1xMBVRc25NaB2S0Ro=; b=VN0yuuXufS9zXLfb6y73ICMxRPi1aOw2x8CWdIBcOfSL4sIN/pzJkRq79ETjy4P8H/ I74yXKqnFiN7Exe1uOLGjuoxrjPPr/K9kY0tmCNVQSBUNqvthq2s7YcJOC8sDctSeh3n 2iD4LhP+5r2LbLAZ9AMZ4irq9X/2Onp9aygxkY3/VYiKHSlq2T+qdqjPF8tHez9X72g8 9C2TlLI9JxAGD9VIGULIeBDYKffz2iLQ1xYW3r4576dbMQN5xltSYnv7++97J9f2/sqz fDaoQzimTr+fpDBlKaW+BlZ4X4zqNYLoVeZfmOn6KAW+YyQYRIJbbgCpBRvrjd0CM8Vq dd6Q== X-Forwarded-Encrypted: i=1; AJvYcCUTaiczm2DOdMda4FC/7KaIGtFknZ7VBzUy0KwWsFNiPJkfoYk8S6gILr4wqMfZTJJc/w/rDkZbU+YlcY8=@vger.kernel.org X-Gm-Message-State: AOJu0YzHuqd96J8FBWRh4QqrlWgheAQZvJJMFd4F7U/8sfhShmpujrZ6 SPGUkq7LtPheD6HJopkwtASOSlmB/e3wjMLm2/sG08wFMwA3dg9X X-Gm-Gg: ASbGncvEk2j157fjKq610OtlupLhlZdg5VCZujroyhdkiFreCmCASyc8NRIn4gHOwnn qpOEdGXYIOB3cypgYsrbpciM9WGI8vsb+QNyxq8CiXqQE4nwt4S2iQ2phHYGYwEXc0t20tuGIgN IhfaJ9anTzDX4LWn0A7kgb2m/rjMVzI7FHRrRw+3LLH89zFF47GWQLqgxxcl2n0kpDOmUtwzNFt vCJRlD88K70Qw5w8DRSeQpwixrpAvLsT8pCFM/NtsEvUJcv5FslYk4= X-Google-Smtp-Source: AGHT+IHY/qiDc4ESBgY9biNcH91XNLwJ0wzCiwd+E9nfO4KdooIKN/6Kym6OcqndVAqo2gvhOdyEXQ== X-Received: by 2002:a17:902:c40b:b0:216:6590:d477 with SMTP id d9443c01a7336-219e6e854c7mr199666195ad.2.1735585794810; Mon, 30 Dec 2024 11:09:54 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.09.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:09:54 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 05/15] staging: gpib: cec: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:25 +0530 Message-Id: <20241230185633.175690-6-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and result in a semi-registered module and does not return an error value if it fails. Unregister the pci registering function in case gpib_register_driver() fails and return the error value. Add pr_err() statements indicating the fail and also the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/cec/cec_gpib.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/staging/gpib/cec= /cec_gpib.c index 3dc933deb401..e5b0941872f5 100644 --- a/drivers/staging/gpib/cec/cec_gpib.c +++ b/drivers/staging/gpib/cec/cec_gpib.c @@ -365,11 +365,15 @@ static int __init cec_init_module(void) =20 result =3D pci_register_driver(&cec_pci_driver); if (result) { - pr_err("cec_gpib: pci_driver_register failed!\n"); + pr_err("cec_gpib: pci_register_driver failed: error =3D %d\n", result); return result; } =20 - gpib_register_driver(&cec_pci_interface, THIS_MODULE); + result =3D gpib_register_driver(&cec_pci_interface, THIS_MODULE); + if (result) { + pr_err("cec_gpib: gpib_register_driver failed: error =3D %d\n", result); + return result; + } =20 return 0; } --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 1A16519D08F for ; Mon, 30 Dec 2024 19:09:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585799; cv=none; b=nNfqheil+YIyP5h++hNf6GIAjpBzDmcak5yXx8reYvzcO9aIKx937J8gtS5kkYiZz2hKM8cYqtJt8+q+1ukKA9+JxhBEKgWlhkGubUIj29nVVJG60CtcJlzIqrc0QzlXQ9T2wQ3Vu2rws3+dqEkFq3hiX406ciyRdzBfQN+sKw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585799; c=relaxed/simple; bh=U0LR+ju8rwEbUYvjjB6dvQR6mgJyl8PNHTJ4E1BXUaA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eYnKf/FPanGlHlmqQP925d6h2HtCzr1sBbZng5Kn3WY4PAbhJdIhCDxWwQaT1iU3T02nCW2RA2ZeP0y9tKtSyPdtRk6RffCVQwK/0bBTVKTOddxCI17Hxk1E3s82ufXvOmTpSeOdrgCJGK2ffmzNermsZPvQMAkbWOCxE9D13to= 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=TlVphKJA; arc=none smtp.client-ip=209.85.214.174 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="TlVphKJA" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21634417587so14138255ad.3 for ; Mon, 30 Dec 2024 11:09:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585797; x=1736190597; 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=+zv7i60pcLCEcQ9vMbRN2C0yUlcmBpSBVzEJlgDdTbc=; b=TlVphKJADllQwLuPb5tS3FbrjOWN7tM0UoLNNjg9fsrhIhNOHTV69gzw1fYu25WF2z LkWhFGvAmIv781vHGk5xAo/n8/TvoRoaYF7efz0P8z7iE5PrgjBNBATT4xLyRVLkKCnM DzDTZqQY9M02jfJ5kxah5zUdddUI1NBNNsqBjIqjehtnFmhEHY7VG6wU8DHWgBhZBguQ 9619+JNFkqD8tyIVBLvSX/CVdA4Fwxxcgx0vevsIXEIrdPIhq0VnjygxhQ593YE4oDoQ GLkWH48SdHAU0Z2nPXkdAeyTrgqMFuFumyTQS6O4trScqG0l5cMrmHATWgHfbpn5qTOL Zz4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585797; x=1736190597; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+zv7i60pcLCEcQ9vMbRN2C0yUlcmBpSBVzEJlgDdTbc=; b=MJ7YzH/dtXzgf786RahzF4Y4ZKuVsrcA6wZAbWUVQfCkf9guYNCcxrneVT/SEaauQ1 0MCWNsylK7ack1KlfBxNcl+5m1o1oVzLlNOB/oKKyNiQSVKsJagCthNzFkduV8M/r8dD +QnsOToQFs7GhDHWuVcdJgFDVy+9On+759aLzlyeQuV2jacsYpNssywZXKWp3jkSta9L y6gV4YXgLeK00CKiKTuTLjzNDuI98jv9O+dRU2V3LAv2ZsulfOcSD2Gm62BfNa2kOF9R 2LOvX/IBAHXz4MFzT18kkFhEdRdbZZRx9z0BJmOqbOcDTlDdoIr49oY+B1DPRM8YPkH3 c7bg== X-Forwarded-Encrypted: i=1; AJvYcCVXv6QuZX2RKDW6SjWAj7K6Nn/DdfFpgULGjS1gggWnIKbm3WQUy8Ti3YwxdhwDJNtJ/38iFUc+wpnfTeE=@vger.kernel.org X-Gm-Message-State: AOJu0YxcHyd1Crvtvo5uPdCP6RcSdkFBKvxW4/03i8Ve8br+VoVGsQsS s9kbWSZIYdf5R0EnF74Q0YH/GjD4E8Wt8m6B4I8Xc/xe/HrQsDok X-Gm-Gg: ASbGncup/wLcTU+1yU+aPkh70ogVF769cMc88d4lvOyfY/ej2QF3hvCeBDC5FRC3tyR p9r7YIZkfwIMZAstKnrwI9AM9usS1io1a6J46OsB9qZM62jPYSHJBH5132W1e8SwhkRppJibcgi qdrMBWQu3KG0pWggi32xlsbd0ixaeJYO3no9GA9B05wRizs/OqMjB/KALtrin995NYtLUrpsGgN 4JZBV3JaLRuQsZB4QK5fs76Z1NN2q1ea8pGFqMrpNhUeW3aVgr3Fss= X-Google-Smtp-Source: AGHT+IESURIwhmTQzoLDKjU6WGUghIO19RfXoTDwFuDIcqeb8wizB7GqrbdJmywOf0ZpuK58FeSNZg== X-Received: by 2002:a17:902:ebc2:b0:215:9137:32f8 with SMTP id d9443c01a7336-219e6f27555mr190945685ad.15.1735585797408; Mon, 30 Dec 2024 11:09:57 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.09.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:09:57 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 06/15] staging: gpib: fluke: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:26 +0530 Message-Id: <20241230185633.175690-7-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail, resulting in a semi-registered module and does not return an error value if it fails. Unregister the previous platform driver and gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Add pr_err() statements indicating the fail and the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/eastwood/fluke_gpib.c | 32 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/g= pib/eastwood/fluke_gpib.c index 3f938ab0c84d..875b3adcb584 100644 --- a/drivers/staging/gpib/eastwood/fluke_gpib.c +++ b/drivers/staging/gpib/eastwood/fluke_gpib.c @@ -1155,16 +1155,38 @@ static int __init fluke_init_module(void) =20 result =3D platform_driver_register(&fluke_gpib_platform_driver); if (result) { - pr_err("fluke_gpib: platform_driver_register failed!\n"); + pr_err("fluke_gpib: platform_driver_register failed: error =3D %d\n", re= sult); return result; } =20 - gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE); - gpib_register_driver(&fluke_interface, THIS_MODULE); + result =3D gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE); + if (result) { + pr_err("fluke_gpib: gpib_register_driver failed: error =3D %d\n", result= ); + goto err_unaccel; + } + + result =3D gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE); + if (result) { + pr_err("fluke_gpib: gpib_register_driver failed: error =3D %d\n", result= ); + goto err_hybrid; + } + + result =3D gpib_register_driver(&fluke_interface, THIS_MODULE); + if (result) { + pr_err("fluke_gpib: gpib_register_driver failed: error =3D %d\n", result= ); + goto err_interface; + } =20 - pr_info("fluke_gpib\n"); return 0; + +err_interface: + gpib_unregister_driver(&fluke_hybrid_interface); +err_hybrid: + gpib_unregister_driver(&fluke_unaccel_interface); +err_unaccel: + platform_driver_unregister(&fluke_gpib_platform_driver); + + return result; } =20 static void __exit fluke_exit_module(void) --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 AD2E919D884 for ; Mon, 30 Dec 2024 19:10:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585802; cv=none; b=Lh5k7+goFK442qWQQXcay6EDZ9KiUTAagJgFLumj6s/xb0njfwiVCcLjPxGUvzTdfGpANHctCB0Mdq6bMtTno12yAxynoGKGSOCy3TtV5DWYd4Zsmw9rWceExH1ovU45uaGrqdzEzakcX6TKNN3ToWt3pJ/OlcAZjXAAolP7dos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585802; c=relaxed/simple; bh=cE62QEV/KBVbpuEXEN04Haz247wnPx6ZbxQNPO1vYBI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P0f/VmkTG2XSsyrqoL52yNm8OKfnclgfbwZQqUH8OW77sQ/Vq1ZUv68/XzEEUYPHUUozkiIuWvxYFzQ7A+rfww7wmnLZBzbjj8/CSXNacBFiToDGvuhY2WNy2bGyaPil/GQLJ9wQyJUbdWxWeQMJ+qEa+oFzBWIu33vCIEe9c6Y= 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=RszxYv7T; arc=none smtp.client-ip=209.85.214.171 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="RszxYv7T" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-215607278acso10737045ad.1 for ; Mon, 30 Dec 2024 11:10:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585800; x=1736190600; 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=yOUO9YPsefTgfIOt0AUjXALb7a4R9PKwgM8CDJeJtxk=; b=RszxYv7TE56LYZaNlAvfMnuZdSE8Ef7lfeQI9uaMwwx0vy3pV5Zfl5z5kZy/0rT80l drZ5e/nSyWIDqiTvC+fWh7JN+WxK/l9Wp8EudvgjSdWekJiBGcvtR881hpHHWGvmV73g 0qphnIqfmPF5RalITjfRYRuHyFbCJeE9U7d4WQQZhn/xLe1k5SKub/Yj2Lz/mvdPYSjm UkII/q7sWG448H7zo8nrpQnr0HTSwwru5eP2ni/pSSNIVv6DIIuyUhBA0E+luMNIvtz3 ofQozBdn/R5UHejZdg2Qs2fDQDJS3b7hDCH9dQ8kgVhmdvn7h5vTc/TcLGDDpEZ8w+zA 7r2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585800; x=1736190600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yOUO9YPsefTgfIOt0AUjXALb7a4R9PKwgM8CDJeJtxk=; b=wtMrIhKowRI1LV+u7kxbrjQa5nPFl6yBQkqS/D9PcYv3YOiaSMB6OjWK9c5MVbxZY2 BPsLUL+A0yD4LWiNrPtMLiZzhqXZDfBvg5/ikA/Qgm4YBBYU8f1wJSsAcJOyk2O+uu8Q hqhY1YyrodfJsl3+gnHNJWQJ7lJKNpS9Tod5SzWGObcnskROfu21Ny8ZTSWSN+XVx4ya nqj7dTVma3gLLQ4FyxjcM+jdu8ZxmvY10xSp+1w9SbKoFUcaPaWnGONtQDttmJuyIZjc r/3fLyc1I3HTOZq9wg0srCuAlmNqpHVHVgoMdQnU98uQ7HVWm9vw2ufkcQd5YDsE8VBh HSBA== X-Forwarded-Encrypted: i=1; AJvYcCUbeXRvocqzSeRM3NO4+fZnCwgVjznlnhJMAgpBk+BBpZXmK3CqFzElbSyqsrREut7dGIkABnuqTOmoQXU=@vger.kernel.org X-Gm-Message-State: AOJu0YxW3WeDcUAFaQARph1r5MeTI4LGiH5mW0Wc2AnhCCuSrDR3TInQ yR1PysoGaoCcYXj8d1C5C651e0fAxIOvPl2Ek5dSKwy3ZuDycCNO X-Gm-Gg: ASbGncszaUt2syz7AKwwfqEEESTP/s7KZfwxspOS9d7zRyahthsVgTkFphSfa7fSCcU F6w85XX+BgFCs+wVan4hJ/mndTg/eYvZd40JO/axupH8wydId6kKW/e6mc3R6LER0461rvFZpc8 3E3OCa2HUnUeE6eTHSdFmeWlN7JxC+icgDiUjrKG8mALd4CDPY94JdQC4sqikWcbY1szHGIgJbx DuN48/BLpbFpGI+noR+bYbbV/nyx25mP+Idd7gwkLYgJuQceQP75QE= X-Google-Smtp-Source: AGHT+IHpjjH9niowQTZF88GunjXK3G9QKnriFbYqrDJc/MYzo+JYu1+AdCCZCrxWNN09hylMh9tXzw== X-Received: by 2002:a17:902:ea05:b0:216:282d:c691 with SMTP id d9443c01a7336-219e6f1d288mr190075575ad.13.1735585800007; Mon, 30 Dec 2024 11:10:00 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:09:59 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 07/15] staging: gpib: fmh: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:27 +0530 Message-Id: <20241230185633.175690-8-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail, resulting in a semi-registered module and does not return an error value if it fails. Unregister the previous platform driver, pci and gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Add pr_err() statements indicating the fail and also the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 47 ++++++++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpi= b/fmh_gpib/fmh_gpib.c index 62791db1c34a..90108ce0304a 100644 --- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c +++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c @@ -1691,23 +1691,54 @@ static int __init fmh_gpib_init_module(void) =20 result =3D platform_driver_register(&fmh_gpib_platform_driver); if (result) { - pr_err("fmh_gpib: platform_driver_register failed!\n"); + pr_err("fmh_gpib: platform_driver_register failed: error =3D %d\n", resu= lt); return result; } =20 result =3D pci_register_driver(&fmh_gpib_pci_driver); if (result) { - pr_err("fmh_gpib: pci_driver_register failed!\n"); - return result; + pr_err("fmh_gpib: pci_register_driver failed: error =3D %d\n", result); + goto err_pci_driver; + } + + result =3D gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE); + if (result) { + pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + goto err_unaccel; + } + + result =3D gpib_register_driver(&fmh_gpib_interface, THIS_MODULE); + if (result) { + pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + goto err_interface; } =20 - gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE); + result =3D gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MOD= ULE); + if (result) { + pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + goto err_pci_unaccel; + } + + result =3D gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE); + if (result) { + pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + goto err_pci; + } =20 - pr_info("fmh_gpib\n"); return 0; + +err_pci: + gpib_unregister_driver(&fmh_gpib_pci_unaccel_interface); +err_pci_unaccel: + gpib_unregister_driver(&fmh_gpib_interface); +err_interface: + gpib_unregister_driver(&fmh_gpib_unaccel_interface); +err_unaccel: + pci_unregister_driver(&fmh_gpib_pci_driver); +err_pci_driver: + platform_driver_unregister(&fmh_gpib_platform_driver); + + return result; } =20 static void __exit fmh_gpib_exit_module(void) --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 250B919ADA2 for ; Mon, 30 Dec 2024 19:10:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585804; cv=none; b=J1SdvfltN0nfvWS6WGW1yrs/1Erb0zD5Pmn/z/FWKF0AE4az9Inm38bGgIUIaOFJV/f3iIP+4mSXb1FtliHt6hiQKkvERyYpTkEADcVvVNHQ4q88iyNsTeS5HFN6AGh0IgT5xBnckQlWSkY6bu1sJ9OZPqkAiJ/q83uZbHUXmSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585804; c=relaxed/simple; bh=NVeaPMc2nCJbhLmBVQxHS97kOfSb9r+NuAjGgpepxUs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KWhfa2sEqO9Y4EL23TaLv+7qMKC9Qw4ArGNr5VFkydysnelqUWRwH81CHM0qww+T0WXwjd0I9jJqol3tnyXIa3v7Km989wnwTlQ821oPcbUUrNrm4o2Aye10q19P6HrCNo/HoeNc4VsmggyeU/D3PzhqJ4PCH6s82Hi4Ygbq/MU= 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=ZN7UYn3x; arc=none smtp.client-ip=209.85.214.172 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="ZN7UYn3x" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-216513f8104so12317285ad.2 for ; Mon, 30 Dec 2024 11:10:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585802; x=1736190602; 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=HWznVxxStAUDNkIlcoS5NcdooWzDrhHOwRt+GbhpQcA=; b=ZN7UYn3xbiPaAvqykdV/N80xaosgXJT/d9aQu2nljhrI7Fylgzx6VY0a7QPakMfASv k5MfhoXb6ZMTCoZHQKj1/ZvU/aOZTx+WZ2f4Rc48b60vr0jb6J/2LMJPA9bLrwlPxi1Q akftl+1cMKL3PLYz2pZHLPIHw2vBZL12NjRXmuhZT3x+YSdTCdT8HkDiAGm4s1ed77NQ Z1PFMfEyl3QoPOUniln23vovFjY8DZBTVa5FuOcCj98Vw48rm1GiWJ4dYJaf/BOGvsoQ w2iynIBn3S3MFjI9EW1nwP1obf+w7hrFEfkL5Wa4y616PVqFAgNaHvE2ZxG40NX3HPxX SWPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585802; x=1736190602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HWznVxxStAUDNkIlcoS5NcdooWzDrhHOwRt+GbhpQcA=; b=cqz0JVxxkmhwX0Dr88PAPbOjdFxiab5oDq3F3kpXTKKwUqr4xvJxtioKqOdzd2pofV fNTKz0Rq3fRv8FG2PpQJUoQMFzvakbDecz5x8rp6YXvAll9e5SJo+TrhsbIZ0KpgvSBs 7p7q9xntQUDGezpYEXZ6tByCrxIGRQSzjY1zokDdCi3ZmrIS0qXrx8MVGsXNrumBjTFE fDQLj7vy5lv7Xba2c+p0zzkyI9vGDRNw/nMi9B1YOMJTZY87j3o0mdFtIfkJnhLcNcpE V1BRtKgVbwnwQrY05lIwIAzSn/3Gbtvg8keO6n+yqLgKWYQ9PDz4aLzxjfZywXGy6CCM xYlw== X-Forwarded-Encrypted: i=1; AJvYcCX9d8hJfK3d8rqg9ygVC4bO0u8aMb345vnyxLguobmbH85fwqg9GR/vPhHfb7ziuDAQ5/1Jt5zluA2nrLs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2vZh+HEtEM82O68ZhSLNxKXIb5LHpS61InO91muFsMhUe8Hhh XDYcg7udW661z/F6fPycfWyrQbIT0F5xxGXj66+5EXGRTTy6Lr5Y X-Gm-Gg: ASbGnctMHq98+5/kFXgRtv25OmHoyoUic5eTKMxeb7l9NC0SSYq6CbLuTnHmUpLIecY T1yHDQ1UkvjKNLvc+/zJvU9CRuAWUQ4Br5VJ8j1DcKE9cHPA7LJf4igwDPkzbnZipyllC3esaXt YLqBzz03ZZCwUjB1HwNYG23mj+bxs85n3Tx5yxtOd7D+z/fE9bPzSy6gqFNlU365pY+0FjFK/5g A7FYfKSmlKjqBzOu+pK/FnxqWRcyrZ0M+DluLI8N/qFsdJSk/pVpoQ= X-Google-Smtp-Source: AGHT+IGbYSrGkEeU/+nvbTWUrx2+wqeKKwAbRjtiQQhHNdBHD7V+odq7z21preBe4lNqcIH59Gpj/Q== X-Received: by 2002:a17:902:c941:b0:216:3dd1:5460 with SMTP id d9443c01a7336-219e6e853a1mr199344655ad.2.1735585802531; Mon, 30 Dec 2024 11:10:02 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:02 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 08/15] staging: gpib: gpio: Return error value from gpib_register_driver() Date: Tue, 31 Dec 2024 00:26:28 +0530 Message-Id: <20241230185633.175690-9-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and does not return an error value if it fails. Return the error value if gpib_register_driver() fails. Add pr_err() statement indicating the fail and also the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/gpio/gpib_bitbang.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpi= b/gpio/gpib_bitbang.c index a2d562cbd65b..057f9264de34 100644 --- a/drivers/staging/gpib/gpio/gpib_bitbang.c +++ b/drivers/staging/gpib/gpio/gpib_bitbang.c @@ -1341,7 +1341,12 @@ return_to_local : bb_return_to_local, =20 static int __init bb_init_module(void) { - gpib_register_driver(&bb_interface, THIS_MODULE); + int result =3D gpib_register_driver(&bb_interface, THIS_MODULE); + + if (result) { + pr_err("gpib_bitbang: gpib_register_driver failed: error =3D %d\n", resu= lt); + return result; + } =20 dbg_printk(0, "module loaded with pin map \"%s\"%s\n", pin_map, (sn7516x_used) ? " and SN7516x driver support" : ""); --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 0673019B59C for ; Mon, 30 Dec 2024 19:10:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585808; cv=none; b=l1dcZ0+FDTy4e8a2lyUpmlcy14NnStKjOh/Z6LPhcBToAnOgJXSWIIFk7kmxR4aMhYZek+7HPc7reaTvVmHnZakH05iF3QC9XNDkiK7CF6dY7EyvkNAtVTjc37HDOQPweR6rwqkqt14w7ROoeynTNLD75TOFdTtB3LqHkJa+O1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585808; c=relaxed/simple; bh=KIq/1HTwCr8bZpAYFpCsqM7GAyYSayUNNC6SBL/Dnl4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gagRulgs+Dh+7IxHurn3dzoKo8s1zFC65FT1ylgPDIRnngeeD9q7CZAbgvBKLigD7020ujRN8p5e9YyB4KncmFVnUtCm2y05vlWhEt9xN0Nn5OLwEjBrgLrxZzs/ITW+A0Wi1Ful+9vX3I4XyFC1Ki/kv82/iiUuD8y5ePKMKJM= 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=QdQCrOfh; arc=none smtp.client-ip=209.85.214.180 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="QdQCrOfh" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2162b5d2e1fso15351195ad.3 for ; Mon, 30 Dec 2024 11:10:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585805; x=1736190605; 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=+F8JnarUOADfyrzT5vkhrwhI8b5I1Xee7siqKCZEogU=; b=QdQCrOfhLK6HHp8SSO/lrraayR99XUvaULXAfn8xJygeC/fCrzsNFQhSSptzYAXiD+ E882111/mEnER+xnoH4akFSJvbxEsQTD0ipehkasCBjkLlHb0b08p8QpBYjVjJaom/NM hXAVzJWK2lhYBXbwS3lSXk5WBO2nN4b+9LqWB0aeBPtAmHZVQLj3Ifxfia89ntHkfeYM R4uhYmtCOX0eYzCs7JVnv9m50bqYRsI4kD2QvEVi0DWVq7963M7uaq0jQjZcWpLGhkfg 8Js9PMAkAx2MOOrrEAW4W0UYDazyqgtp02gf7P4xDf1NmAgKTo0KaGDl9JV5AvmQH3r+ 9Evw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585805; x=1736190605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+F8JnarUOADfyrzT5vkhrwhI8b5I1Xee7siqKCZEogU=; b=psD4fZKHGH2TLzG2oOnMFF49ICgBt3lR9R0hHsNs4sez0Im/ndJp5FfWWbf4kbRfTY HFYI6TQYDvwsaGDFJboNfE/uvcC/NFJxKnK+5Apdc/dIAmKANJZJmyOcDJiYKAYNwVjG P53h1ZDrzIT6iYoGpQL7cb+PIl5W+lHBAq42oqcn1w2aj1ooHzo/b+m5sx0ltJwgAHdg hHOv5PiteTlcnOUhPKcRxi0DjCHtO8HWDLPHg0HTYK2uVypNN5ihvG/61TSLWmqqrJ+j ruAPPTGf8ciW8vrQB7uQ9a3sufpFd1JvSN3RXWONndSHTLZ9D9mSsaLB/y8TZ/m1ZCjt f5eQ== X-Forwarded-Encrypted: i=1; AJvYcCXnJ1Gx2Iss/Ws9nIpruAmEMZ3H5m6sV1Zrd/MG6cEPpG70Uz3moE7f4xzDrKxAxeUFLIlfOePYgwHabSA=@vger.kernel.org X-Gm-Message-State: AOJu0YyD7egHNjBdOMfzHMGN+u1l68AiAaTGr4o4t9G0aVA8FrPNXtO6 qyMdyHoTnjFP9owMYi6ZS9ICWFk1abhth30y4sCgle3BFkgD9Gl9 X-Gm-Gg: ASbGnct51ELpgRCheMUrfnsY4Pw3uv0oO5fiNu+045skdrtHnxvkJfqbcmMO1VZJMU0 289aF3wrgAzSZ9jtpwHK5QW76RprI/X6ptiO+aBpdPWUrKJHFZZ/WgmoaOVGk93qsZrGew8knjj 8aokWIlELlangoxF4ZCDR1kUOR2R250tVZtCpR+0u4fdz2U+m7WjH6qeW2XtHUSLeJbVAigcXqP Lv0fq9LIzkD3fSab9gwRS3I7a3c+mqZTiei8kKCvenTfutSEzPiOs0= X-Google-Smtp-Source: AGHT+IGadNmCQAoIzPnrZyA0euZ/8t7aysPuNDsrCo0I5r1irNRk+V4RwjVeq8hyG8NXuYCoSQdW2w== X-Received: by 2002:a17:902:f542:b0:215:b8b6:d2c4 with SMTP id d9443c01a7336-219e6e9a23amr190539625ad.4.1735585805271; Mon, 30 Dec 2024 11:10:05 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:04 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 09/15] staging: gpib: hp_82335: Return error value from gpib_register_driver() Date: Tue, 31 Dec 2024 00:26:29 +0530 Message-Id: <20241230185633.175690-10-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and does not return an error value if it fails. Return the error value if gpib_register_driver() fails. Add pr_err() statement indicating the fail and also the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/hp_82335/hp82335.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/staging/gpib= /hp_82335/hp82335.c index 40afe42aea47..45157ad65d53 100644 --- a/drivers/staging/gpib/hp_82335/hp82335.c +++ b/drivers/staging/gpib/hp_82335/hp82335.c @@ -325,7 +325,13 @@ void hp82335_detach(gpib_board_t *board) =20 static int __init hp82335_init_module(void) { - gpib_register_driver(&hp82335_interface, THIS_MODULE); + int result =3D gpib_register_driver(&hp82335_interface, THIS_MODULE); + + if (result) { + pr_err("hp82335: gpib_register_driver failed: error =3D %d\n", result); + return result; + } + return 0; } =20 --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 9161A19E804 for ; Mon, 30 Dec 2024 19:10:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585810; cv=none; b=cz4bZNXWFdYUzlYsiMybcjN/VsYJnNL0vXnBUDhdkpanbyF2+eQVgEbBajDABz91YtepJ2AW+DCHFI+pMW7XQaFAE5d/B7StkrljPm957hKGcLvdoO0PCs21FcVxNXH8u+Og6C05GTgst19jPAAwhkEeAa0H+DBTLMwC/j5/TmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585810; c=relaxed/simple; bh=K6pjky9Ek+SsXugaEvIVw+NDXMsgVeIBpUzxf1GYqic=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K+JQr/Ddz7txe25MdAcoAQYm8+OcuOydfKAun8UJgfps1o+RQLm9Txyxk9m4ifmlEgdvp9qgKamxRfZUWFD9hgT6vU/bgnRq8YFYs28Z81I46Mvxv1Ynqjbu/whLmeynOTGGycMM1ZOPIOu0LPXViK2O1Qv6jBXl40gzcOfyIa8= 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=ajtTACvA; arc=none smtp.client-ip=209.85.214.177 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="ajtTACvA" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21644db9f3cso12671315ad.2 for ; Mon, 30 Dec 2024 11:10:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585808; x=1736190608; 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=M468sUTraHS5kC5PSlnNFUa8bcgzq60Ww60qpx627NE=; b=ajtTACvAkkj+yFEAKgD1ysRLYmKNevjRVLuXAZ4oJjRqjSvGRv1gK+N3RhncIb8k61 WmQSj2HxbxXmCYWTbwvKE2/iA+ueYWWj695o8GOLRGJc2kL3AtNGpo3mfbvyXuX4ks1R 6SvM0AtEQd4J0VsuG+u/kPaIJKd+RJ1XMI2Wm00wtcSh/7NWIBrUXjBCEgczMf5pcjsZ Siipm7d4QCk47KLsgJqLkul6qBY5OptREJ0KNf+x5sxn2OlGU4bVYiW2CqC1Tu5NjfWo mPi0ceCjHp10CQ9tdCMS73hyz9mBz6LKY6X2n9S9yh3uYOJ5ZaTL5fFPFmNWKuMYMaIJ EfvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585808; x=1736190608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M468sUTraHS5kC5PSlnNFUa8bcgzq60Ww60qpx627NE=; b=W42oR/5mYwe8uRFvp/pVEDYwODyI9GMydd9Jogn6DOdawdZEesiDOw3A06xzrILLAy kCwxpAaBTGIFv88164TJaz/KXCtbiyX0DrnJ144rkEzxj3LKy/+wRTFXU7vxysSjXda/ Bd0jbrjerB+J9t8lAy7ho63riDw1s0VzkyqMaOxbFynDFBoLWfA36w516bYzl9j5y8Ds jk8mDTCzQR93TpLS6RIpyrU7NAW3eBYpy/Plm6Q5HuiecYSbAxx+LtW5Jk5ZVp/qSZrn LhsUfjhRAgyyJUGDNN/PjZR+okhuy7Kd0t2Idg69mOxOtOkSuRq3719oyQZjvCLLkJd7 HO+w== X-Forwarded-Encrypted: i=1; AJvYcCWh9SpcPEjbHrFVe9VqpYzcqeCVECuXqQEbdwh2optXL9vLtquNlT6/rb+nCHkpwPsZCs8oXQ7pXXFEAZY=@vger.kernel.org X-Gm-Message-State: AOJu0YxtSVrUtLATCd5BwL+G/InUnqVLlUNF4dpnooBTViOByA430lLm 7pSvcm1DuqpQvN/o9OJ2Q6v+j9lwMhES1hMUkcsGDU3S2ryTTqTqWG4gog== X-Gm-Gg: ASbGncuLltwzMcElU2gPDSBlzTv77XlVNvMRmWPPa7Ko5HUX+71Xg0+uqi2h/ds8D8k 1lh/bzS7ulRe1pNIjYGJKAYma8AkLnVLg7deR2ds/dJHsIvVZ7BWkuW/8cc4NNOZvcRroSnjFD6 /Ir1gQMIG5Qgn6J0cIcSyf6UMktKuF1QWBkAU10qv+16USu8wtZJRWjCBiXfKC3wmfPupNnr/8t FIROV9KNNrqcaoFM2vQWFJQl1weTCt8oJfT4rpk+IPykQb9P6buZbI= X-Google-Smtp-Source: AGHT+IHt3vajaSu5hkKlS/aNe/nV1zyzO8BEmVLGz/v3Of8aTqXbYAMdXCmK7VNgLgBDFHoMns4PCQ== X-Received: by 2002:a17:902:d4c9:b0:215:8d29:af0b with SMTP id d9443c01a7336-219e6f2706fmr192690715ad.14.1735585807835; Mon, 30 Dec 2024 11:10:07 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:07 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 10/15] staging: gpib: hp_82341: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:30 +0530 Message-Id: <20241230185633.175690-11-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail, resulting in a semi-registered module and does not return an error value if it fails. Return the error value if the first gpib_register_driver() fails and if the second gpib_register_driver() fails unregister the first gpib_register_driver() and return the error value. Add pr_err() statements indicating the fail and the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/hp_82341/hp_82341.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpi= b/hp_82341/hp_82341.c index 8ad1c885a9fb..4953dac1e177 100644 --- a/drivers/staging/gpib/hp_82341/hp_82341.c +++ b/drivers/staging/gpib/hp_82341/hp_82341.c @@ -807,8 +807,21 @@ MODULE_DEVICE_TABLE(pnp, hp_82341_pnp_table); =20 static int __init hp_82341_init_module(void) { - gpib_register_driver(&hp_82341_unaccel_interface, THIS_MODULE); - gpib_register_driver(&hp_82341_interface, THIS_MODULE); + int ret; + + ret =3D gpib_register_driver(&hp_82341_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("hp_82341: gpib_register_driver failed: error =3D %d\n", ret); + return ret; + } + + ret =3D gpib_register_driver(&hp_82341_interface, THIS_MODULE); + if (ret) { + pr_err("hp_82341: gpib_register_driver failed: error =3D %d\n", ret); + gpib_unregister_driver(&hp_82341_unaccel_interface); + return ret; + } + return 0; } =20 --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 09A461B0408 for ; Mon, 30 Dec 2024 19:10:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585812; cv=none; b=XF4IwPKykB/SuqrmAMVgJ2GlYlaAFJK7sJgzXFa+Yuo23ppB24OyMHXJHAC1EtksKPlBLEvRPdjqu++ztEk2d/Q69dC5NacTADAVGq0x2bZodTSBl2IhFjBy3ew66vs+Kb/0lCPp37lxJ9PesuSWcMxVz0h0GdSiHB6hgVvmncU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585812; c=relaxed/simple; bh=DVomB153uv2ucWkt4FxxYYUTra1dhfZtXV1EuSVL7mY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H5S7TZ6XK2tnQQ6DgVJXaR3/5gJjZO4HNobIqd2hK8gN8nlSDjQPTHsP9vBYD3/090dEeS2bjKW+XLGDWh+g9F/sccdX8Sra/QM2NJod8Eu06rx3czmnRgP/UrHNX3vFe8Tw3jNGF2T9xi3FAjJrvf8f45EduT0A0fjBQ0DwePo= 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=Xi7IwxL0; arc=none smtp.client-ip=209.85.216.53 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="Xi7IwxL0" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2ee4b72d4d8so1859055a91.3 for ; Mon, 30 Dec 2024 11:10:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585810; x=1736190610; 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=/jDmzy7KMufL/WvjCZgi/2m4YouXgT+NH6CQmE520j0=; b=Xi7IwxL04jHOFDHRuLho6QOyKmKKUbmEKBwQIqnJOaMgeXTYm6oAHSwSSQLXj3X0EE CCgIyEcYpfvC/G7vAs+dD6uoDUEhWHbxHcZoalJJpB7GEicuWghlV3kpE4F1gsW1Phlu SsCvSSe58MRC+RuwX7JNObLOEmxIxf0o1r4MtSkBtePKq2vrhpDYq9hxVRuSk/MOxsRl yDztavRViDCjG/PvcImt/j6VXDeXCh2pAu7XlZQT3Ixf8yuV8yKU44iyiFQNzsm1Q4xL YEQ8Z6pCLiVB2mmmgCIFinlBt3F7bWhfUIziunnXiNJ8ry6CBQV6YzDvkOcWjTj9sbgO 1GTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585810; x=1736190610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jDmzy7KMufL/WvjCZgi/2m4YouXgT+NH6CQmE520j0=; b=tyXeM/nt5IlrvxtVmUuZt/owVvzaRz1bf6s3lGRZrAGCn/27Deu9QvTuTY1FAKdPoX 7QpgkZiY3OxPby6aVFF/Du8s+U5RIQCJTHpxAb3lCmzst0VY7MEw+sV4WK75ZV85k4e/ 35A8eGCt4UO0JH99NkNEvl0nlVa4GkGkD81zrvBy25JK19nGBcOpZmDvkFcuoWbHrGT/ qdkHMll6gEeN8UgxJL5qmT1Iint7i3ZT0YwOpQVD1tiY5ja+xPLu+7fj3gyE7dBrDiy5 nvS3m2jkeIEkDuzbAIQ3QMg6rfaBY7ALoasYXKdM6SIUx9bPpUAWq0oUIYSFIgFhVOrY zLcA== X-Forwarded-Encrypted: i=1; AJvYcCXMr0UfJGV5nXs5asLsbDw6a4kU9Q307c8BNQVWBnJJ3TgNMXX7XwMhYtVXAhATzK8JqImHiCYSfemBc/I=@vger.kernel.org X-Gm-Message-State: AOJu0YxgU4Z9KfO54iHzLSU/RDUmja3D3SOxfdW/8ygSLcIjkGryfREe 19t31qZ12oQgfAcncxVDtWaIpF2BYLDuLiuEw2CfcQfJeceZ+Hnr X-Gm-Gg: ASbGncuZh9HPxl+WL99asbM1iYnN4wV/Ow3dKKf9V3J/0Fnmj1hn2Q/NSTho9DHPRhP 7cYvWrWrC3Zv5Xnb6toUdyYQLdqxHqIiG8b1K29howc4+1TOXnL/LDJVjPwz+peYtG2IGPnJ9p0 uELacob/098nAvTGpvQksYhh8j532Qz34vQkxo+jzVerwa9HYDh5+1BSDJ/jAFEwJ6sbkLCbH+V 3PUHY1JPTpZgR07WXMC7BmrueC4pwDMuouDkTDSlPbNAMAx9nQUznY= X-Google-Smtp-Source: AGHT+IGXu5X8emGu80X/vswGBEa425Jx71l/AtvmGRKBY9eyqT/Embg2lDyPy7hNygbdDUTDPKYXig== X-Received: by 2002:a17:90b:4ed0:b0:2ea:b0d8:d5ed with SMTP id 98e67ed59e1d1-2f452efe0f4mr20004073a91.9.1735585810358; Mon, 30 Dec 2024 11:10:10 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:10 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 11/15] staging: gpib: ines: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:31 +0530 Message-Id: <20241230185633.175690-12-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function ines_pcmcia_init_module() can be replaced by calling pcmcia_register_driver() directly. The error value from this function is not returned and the previous registering functions are not unregistered. The function gpib_register_driver() can fail and similar to pcmcia_register_driver() function failing, the previous registering functions are not unregistered. Replace cb_pcmcia_init_module() with pcmcia_register_driver(). Unregister the gpib and pci register functions if the subsequent gpib or pcmcia register functions fail and return the error value. Add pr_err() statements indicating the fail and error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/ines/ines_gpib.c | 94 +++++++++++++++++++++------ 1 file changed, 73 insertions(+), 21 deletions(-) diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/i= nes/ines_gpib.c index 9d8387c3bf01..9d4bbb8e8a75 100644 --- a/drivers/staging/gpib/ines/ines_gpib.c +++ b/drivers/staging/gpib/ines/ines_gpib.c @@ -1227,12 +1227,6 @@ static struct pcmcia_driver ines_gpib_cs_driver =3D { .resume =3D ines_gpib_resume, }; =20 -int ines_pcmcia_init_module(void) -{ - pcmcia_register_driver(&ines_gpib_cs_driver); - return 0; -} - void ines_pcmcia_cleanup_module(void) { DEBUG(0, "ines_cs: unloading\n"); @@ -1420,28 +1414,86 @@ void ines_pcmcia_detach(gpib_board_t *board) =20 static int __init ines_init_module(void) { - int err =3D 0; + int ret; + + ret =3D pci_register_driver(&ines_pci_driver); + if (ret) { + pr_err("ines_gpib: pci_register_driver failed: error =3D %d\n", ret); + return ret; + } + + ret =3D gpib_register_driver(&ines_pci_interface, THIS_MODULE); + if (ret) { + pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pci; + } =20 - err =3D pci_register_driver(&ines_pci_driver); - if (err) { - pr_err("ines_gpib: pci_driver_register failed!\n"); - return err; + ret =3D gpib_register_driver(&ines_pci_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pci_unaccel; + } + + ret =3D gpib_register_driver(&ines_pci_accel_interface, THIS_MODULE); + if (ret) { + pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pci_accel; + } + + ret =3D gpib_register_driver(&ines_isa_interface, THIS_MODULE); + if (ret) { + pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_isa; } =20 - gpib_register_driver(&ines_pci_interface, THIS_MODULE); - gpib_register_driver(&ines_pci_unaccel_interface, THIS_MODULE); - gpib_register_driver(&ines_pci_accel_interface, THIS_MODULE); - gpib_register_driver(&ines_isa_interface, THIS_MODULE); #ifdef GPIB_PCMCIA - gpib_register_driver(&ines_pcmcia_interface, THIS_MODULE); - gpib_register_driver(&ines_pcmcia_unaccel_interface, THIS_MODULE); - gpib_register_driver(&ines_pcmcia_accel_interface, THIS_MODULE); - err +=3D ines_pcmcia_init_module(); + ret =3D gpib_register_driver(&ines_pcmcia_interface, THIS_MODULE); + if (ret) { + pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia; + } + + ret =3D gpib_register_driver(&ines_pcmcia_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia_unaccel; + } + + ret =3D gpib_register_driver(&ines_pcmcia_accel_interface, THIS_MODULE); + if (ret) { + pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia_accel; + } + + ret =3D pcmcia_register_driver(&ines_gpib_cs_driver); + if (ret) { + pr_err("ines_gpib: pcmcia_register_driver failed: error =3D %d\n", ret); + goto err_pcmcia_driver; + } #endif - if (err) - return -1; =20 return 0; + +#ifdef GPIB_PCMCIA +err_pcmcia_driver: + gpib_unregister_driver(&ines_pcmcia_accel_interface); +err_pcmcia_accel: + gpib_unregister_driver(&ines_pcmcia_unaccel_interface); +err_pcmcia_unaccel: + gpib_unregister_driver(&ines_pcmcia_interface); +err_pcmcia: +#endif + gpib_unregister_driver(&ines_isa_interface); +err_isa: + gpib_unregister_driver(&ines_pci_accel_interface); +err_pci_accel: + gpib_unregister_driver(&ines_pci_unaccel_interface); +err_pci_unaccel: + gpib_unregister_driver(&ines_pci_interface); +err_pci: + pci_unregister_driver(&ines_pci_driver); + + return ret; } =20 static void __exit ines_exit_module(void) --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 793261B0428 for ; Mon, 30 Dec 2024 19:10:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585814; cv=none; b=T+knEn6bL1BfAp2Fay3O9LA62T4PRM3aps5m23QfV/ZE0BRsWXfvOfzn3uIOGRfQdv3PLwec1JnVvmvnlW+2X6pM7z6WT+Q8DY9PxCyT1Ajui7evN/NnOpxXQYc35d6jYgpqwLCOv0lcbn3t1wRQIprfTDIumzyJEwYgMdAojAo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585814; c=relaxed/simple; bh=bryvN6+ttkW0iQP98mReS5unZVw3gunWkrBDholDReM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JJlJJb9uL2gPU3sXvDq3/gp/Y6YByv9V6ZxWg/3VD23aIRcCn99N30pa6YgsYd5eeMuPaEXqQVAx3uHI1Tir/hj6xEVCRI0unhlejSOAFRUNdJihW7nvQUGj9/XA4Z78/rGrCv5hvtKcRs5p1D1h+ipSOz1OxK4IXcpIjjF88tk= 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=e5Aq2+Vs; arc=none smtp.client-ip=209.85.214.176 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="e5Aq2+Vs" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2162699e0ccso13926515ad.0 for ; Mon, 30 Dec 2024 11:10:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585813; x=1736190613; 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=XgdsETXzbb58Msi7wLGZzMbq/x8TvmIWWt76a/4RotQ=; b=e5Aq2+VsIDxMbpDEEr/EGl/vaVut4bbxdTHpM6m5bhbSGW4qlQj+8T8AthRsWAs6t/ XVy0pH9Z6aa7fM2+hVPBw4xAkYjrAmnywQnx2GRN1HTXtBW9xsvrz0e5GruAtVaulV6Z IluTzPNSvY3MG2L/zJ6UhdBtnNR3/ORMkVPxaKYbKF6NiqVVMIZ8AfJAxosrbg/nnVi5 YYskFX782sZ0bZ+CrEwh0pOduEwbnZ1obg6YDG3Ci322xoig872/rcpFL1bQFV/zAMuW T3uZdSMZLQK88np/56iV1gAT9FKawUG0ii2y/NcZo5vEhAB/xnfOlaGdimOORVoCuXck D8RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585813; x=1736190613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XgdsETXzbb58Msi7wLGZzMbq/x8TvmIWWt76a/4RotQ=; b=W/d0E26G0MXUTf0BhSPfIXW+FUi7IJiX7PTWY0NhZyflTipMVF/uxIEG0E6fKWVcq/ f4X1lj5Q+avbqaZ9jTd6oiQMDTkRGQwgxaDtFpgO4hPbzAhWT6RxyJBJuJ+UV61fXYve 0My2MvW+t2kNx53ly2QEgnNeFT3Jfa3PAbhJUcKwXUP/riqgRC7JgNPIeiAEtfDEqK8L qP48oHXAogeKyEuLeu8DjILfHsaS/jRSA0kR/bRVzvZHxaAf8GlL4n6r3G1R6+rnBMkA TrXBZQkC4nrakFR20g7sps9wwhyGfKqhUKKOQ6j5iOpBeYZ5qRAJfbRwIM1j6TD1ivNe fkFA== X-Forwarded-Encrypted: i=1; AJvYcCUDOFJ0ac5HDiRpI0qjJWgeZpZr9tfIskPqHQMhM3zop3FpMVjKPPbdKeJtjxd/W9k0iuZHN3Y6AgB8sow=@vger.kernel.org X-Gm-Message-State: AOJu0YznAvO8oQM2SH3JmIPnj2uCB4rjxJcJYm6+4deEfWZHe6dECN6M Lov0xvh+yJjwnu3EsQ3TFp1NkNweK80DpsdBhg0IMawZ6PySrtsA X-Gm-Gg: ASbGncsVdQ6W73/GWkW9C61MoMlvB9SLX614btItgglgcQmkTBR/XnJPj7v6scSOrk3 njf4KyEuPvUhZ5PMDh0c8gYWKc4T/Z+hZXHyi16gLw335RXMNFwAd4dOy1KCScsuPhEK1uWgeVZ rD7SF7H78lk/UYv29cCkxz17FI9oAmboHpTuTgutTAQWrymw0cAB6niuzJeCK8pprwIa+lj+B8a z2cZ/wf4fbyTMyNhq14R318kvBEGwNqWb5EEO35ZBnPvRXTfXODKKo= X-Google-Smtp-Source: AGHT+IFEZDT0ZZZpAkuuwgyTJG0aVUCftQTdq8RZZXS1UgwHG70xom4o6GAMN0sSNki6+CrsR71DHg== X-Received: by 2002:a17:903:228d:b0:215:a96d:ec36 with SMTP id d9443c01a7336-219e6e9a86fmr185039395ad.5.1735585812880; Mon, 30 Dec 2024 11:10:12 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:12 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 12/15] staging: gpib: lpvo_usb: Return error value from gpib_register_driver() Date: Tue, 31 Dec 2024 00:26:32 +0530 Message-Id: <20241230185633.175690-13-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and does not return an error value if it fails. Return the error value if gpib_register_driver() fails. Add pr_err() statement indicating the fail and error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/s= taging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c index 796c3a5be545..5e279d41e3f9 100644 --- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c +++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c @@ -1181,7 +1181,11 @@ static int usb_gpib_init_module(struct usb_interface= *interface) return rv; =20 if (!assigned_usb_minors) { - gpib_register_driver(&usb_gpib_interface, THIS_MODULE); + rv =3D gpib_register_driver(&usb_gpib_interface, THIS_MODULE); + if (rv) { + pr_err("lpvo_usb_gpib: gpib_register_driver failed: error =3D %d\n", rv= ); + goto exit; + } } else { /* check if minor is already registered - maybe useless, but if * it happens the code is inconsistent somewhere --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 1B0541B0F3C for ; Mon, 30 Dec 2024 19:10:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585817; cv=none; b=HjVOfMJ+y7syNCs/u/L98Mi85u89XklhuaE5QCieBW3xZYnHDeJ2bmgN4dvhydPILeWWFjrG8bWyEW3D33b+UIIYhXxMZjVEm26ei8vShJkn9i+V7Sa+7DGZBHf4sOhphLjqpETY5V4ZMAafM2iPO+213McXHIs0ARckBYpV9z4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585817; c=relaxed/simple; bh=YMqc4H3fgdJVkppKOUIV9sXcrnbeGdblny71kyRvo4c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XMr7MhZRYN+jfLM5wgGCxFnHBro40ctqdo3C4ppAUWSOk3ICxevbdML5OUZ2GxAqsrf35CU1A0sKGwRONpnsuK+NJLrM9zgIceRCy/i9NnJ5PcjBQ/lGcQZEXTfJLawYieE0W4u0zyMcBwPabm9B8sBrgnYRvdRYCFZDi3iK9ow= 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=Sw0BSHeJ; arc=none smtp.client-ip=209.85.214.180 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="Sw0BSHeJ" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2162699e0ccso13926555ad.0 for ; Mon, 30 Dec 2024 11:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585815; x=1736190615; 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=Q2sVOBVrwEeE+JJiB+YOksNrh6jAvMviZPje1pPppbw=; b=Sw0BSHeJB8Vocw6le+H2vxMCUMt8MHUOS1LYOMIQ2E5aG0nItXjKpuhKkfKnqmWffJ bxiodvCqfrbGKskIGXK3BkIStpTe1UG8OIbXbtCMeE+dg/QyBEK0kbu0TxNBGWlE4dpL ogXwP3TYpaL3PNC9IQwLZlDMhcxNxQdVCLOYxdPy1mjI/8trZTT/WPNOegffGJjiSTSl L+vd2UQIJv1xF2g3xjoxbS7rluEAFRhc8k7sTxXtGyoNmSecjbx61PZoDpr8vvDptsPo 5wPcGayW4RKMzSOVp0Lp1CHF7jN81+fNjxR/03Dx8GWgLLXWElfGHhWnzJWvyQR/qggo hDbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585815; x=1736190615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q2sVOBVrwEeE+JJiB+YOksNrh6jAvMviZPje1pPppbw=; b=FnKau9EAxVRI1EbRe63rGqEttKQ1vRTTRpT6Txj6aKstbubaa+mWYw0oPgrhpD1VcM L+asfGr/+GLb+xz8dZNp7RECDCdnILhaJXaukvvt5vIo9GWXZ1y1thWDjfC+XZb6zZQw Jjf4mISA+K6usZIJdbgFddsvpSbMLelMW3ddpZfgBI4DtcBGrRKXul+IhNdDE/3d7xeg RjUlwQ1AjG6RZhfPmYBKoM8StYrrhQ9nKZa9SMLjwWPiUHXT9v6i3mcuWAy4wa9HWkkB gHKe8cPpDB7qZa4ufwiYxKLmGuKA53Xyjlps0pAwkw5FWzosrskXnOvz4DrNvWAO5J8v VpAQ== X-Forwarded-Encrypted: i=1; AJvYcCXhlkcYzDs33o/XBo9KOiDtU+2d5iG8KGESvEr2x9vYCA7sx/ClKJnL2/e4QHEAaDzSIJyolKndJR/8hUg=@vger.kernel.org X-Gm-Message-State: AOJu0YwnHD96OUW/pzLjsPq2tyvNuOcPiKrlazsmV0SsTn54tnGTAGyJ 2gaDs3PcEVHxdPxq0sFRHrlSLAemJwMX/Fi0WH8aD59LTXkHVtGo X-Gm-Gg: ASbGncvnu562/mAwe9vVR1l2vfjB4DHGIrcwhBXslueImjTBOm1kcZKqh+POQSaPrFL i7auAwTqnaOCANnNDdjMRkDL1n7+yBrJ28cJagJT0b+LFIv/HH1pdhoTuwqVePTpNRHWJSaaN8y C46TnmJUkOik5/ttfI4oFKAq7RfWClmYCw8XpW3NG+FlfeE9Dh7MT11p/NkQwfTmcYzRHCIRGkR uO7gRYnrs0Gf6iGx+J5OfeiXD/ktd7aa4iNHWJ8SVieGEeKTDemSKg= X-Google-Smtp-Source: AGHT+IHnajyFEDG6mFVW8FWpXBUQF0MsBPPHjjNZiErai7Shi6fRF4Zdw2iiQMPTdQCda6s1ZqNVPg== X-Received: by 2002:a17:902:c951:b0:216:1d5a:f348 with SMTP id d9443c01a7336-219e6f09036mr199112775ad.11.1735585815438; Mon, 30 Dec 2024 11:10:15 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:15 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 13/15] staging: gpib: ni_usb: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:33 +0530 Message-Id: <20241230185633.175690-14-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The usb_register() function can fail and returns an error value which is not returned. The function gpib_register_driver() can also fail which can result in semi-registered module. In case gpib_register_driver() fails unregister the previous usb driver registering function. Return the error value if gpib_register_driver() or usb_register() functions fail. Add pr_err() statements indicating the fail and error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gp= ib/ni_usb/ni_usb_gpib.c index b7b6fb1be379..b1b9598c3b33 100644 --- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c +++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c @@ -2619,12 +2619,23 @@ static struct usb_driver ni_usb_bus_driver =3D { static int __init ni_usb_init_module(void) { int i; + int ret; =20 pr_info("ni_usb_gpib driver loading\n"); for (i =3D 0; i < MAX_NUM_NI_USB_INTERFACES; i++) ni_usb_driver_interfaces[i] =3D NULL; - usb_register(&ni_usb_bus_driver); - gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE); + + ret =3D usb_register(&ni_usb_bus_driver); + if (ret) { + pr_err("ni_usb_gpib: usb_register failed: error =3D %d\n", ret); + return ret; + } + + ret =3D gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE); + if (ret) { + pr_err("ni_usb_gpib: gpib_register_driver failed: error =3D %d\n", ret); + return ret; + } =20 return 0; } --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 DB7FD1B0428 for ; Mon, 30 Dec 2024 19:10:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585821; cv=none; b=igzANuvRtROmepeibS0ZOsFmvSl6QpMe5mlj2eZKq8trGG68yqX9E7V7OWuK6w8k2qj0i4ClFt0Cb9TrN+keqnVIC8QgIx8bQhlRHX7PZmLOJVxogoWCBEY8kMH+O0rU2QyIgp4RGYlo7VQZN4Oym+2JA4u38fuGGl+LrOnRyag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585821; c=relaxed/simple; bh=KPXSXRlBPRMJiHBCXI6kuUDpKB9leNo+bj39A4iYM/M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YHCSHMN3nWnxS2qkVsWGu01YVyElmmqUGHhONwTwq0b6xHEaBYSUfjfzfHXtt0iZ7yzT5akAbdbZmr24atlGpaK6T+J+tCAvBXFwoYJpkC2OSUGBehOgx7Fp/hJm3lsH7jYic7Zz6eAd+TLKuYyz25QTANFVOM7WIwmVImwwZ3w= 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=OPttE5i6; arc=none smtp.client-ip=209.85.214.170 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="OPttE5i6" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2162699e0ccso13926615ad.0 for ; Mon, 30 Dec 2024 11:10:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585818; x=1736190618; 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=i+RtJVGqmy9jZtYoNReryShDgdjIDGmle0Bm8XSJeeM=; b=OPttE5i6yM6SHmI45mKneJU2rjdjLUJ369f+PWRjn4byyJiYfZX25qH54kx7HalNJT aj9Vb0ayfiVo4cMrJUNPNTXD5wVcy6J/BbSz5l1EllSDQaFbir3q5WaPrOzWeg0YlQMF w7ZiRx0Q+fSn9VHVHbm5iPwXRJJyqoMnfIs/amOIV9WTsSvspoRdYIhaa7vo+Ln9hc0L tqEjDQXehwkS7RrfVeyt0Wp9cCd8cyDPy5q19QwyLRfEM9qBxRZ5lZoFmMlnZEWWE5xk 4F0LXhT9z/td9GUe1QGVRliV9QkUrqt9I+SaA8bEbCZiTtUt/taiT0mi1waJkSufoAXL +Ecw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585818; x=1736190618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i+RtJVGqmy9jZtYoNReryShDgdjIDGmle0Bm8XSJeeM=; b=MjvkbYOzpzFNA1fukiKU1RCTmv8JDgEo85ACiYzd0Bnv/kQMqePOiH1HQXzwo0jKcg lhGpPk17XNHCgRB4n0wdVB8zbPBeXm/GNaPfmm2ZNcKyVKFu5FrasoquCS8cHzCodkpo Wqz0qU9pjNt+B1eK/gas33VD+qTOy3d4Ps9Ie5IqDyLMPZ3UwfO4/EZhNKxSbts41lak gQapk5JRtC3g/eDaZsMLuJlnAkbgxfNFLlQbs9QZLm8jenl2ZCG3mGW05Vtn1FIvGkTF XD94jmrwZNQcdQCMoiMRJ60K98M4HFDAQvw4L2F53xgC1i21FV/GU52GiLX0Jt09sc+7 S4CA== X-Forwarded-Encrypted: i=1; AJvYcCVNqC47dklO9/HUYpuatM1by7TqAqDp6ZuIGcWzW0DswsyDtiDpnxfqX6+3mgI+8ZsXiObYjQEH/qjHofg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy12VnK0G/6tZ7Y/biSBBWz2YGX+aq+gIw/2iGR3Hx8xeTyNK2e VKqzRuOIBDh2T5XX7dXLfsTjKoK1LxtH6ekN/qLUm2x7L/1P5hLW X-Gm-Gg: ASbGnctB/WE+hYKVffAmFEInyqrcHVKSNbkt3/eLTp6GMFpYSwd435yHRvsO47d4g4M 5a3MdwvoCzW0xI0ZoJgxaN3izPMPjJE+TizZa2qxIrNlngVp8jYAygnzkFm6BG/eGoLJkAnbsvn YCuVUtCbmQhWFObiNd8ZNZKapbQ4sXOokVVZyiojtHWXztHpLfcmYK1AgZ0v8Ut/dKcV6JZeKww Mc7H1RjGyDndTIFy5/N7qf5QD+l75HedwHacViyJMwADAp7plUtJJ0= X-Google-Smtp-Source: AGHT+IGBiIZXCO3lxy5cPikGgYE0wWN5YV97YMPv75GMxPeGW6irlOBjjMtZCu94t81s0U0kQ9b5xw== X-Received: by 2002:a17:902:e848:b0:215:740b:d3ec with SMTP id d9443c01a7336-219e6f1db38mr191724365ad.14.1735585818107; Mon, 30 Dec 2024 11:10:18 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:17 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 14/15] staging: gpib: pc2: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:34 +0530 Message-Id: <20241230185633.175690-15-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail, resulting in a semi-registered module and does not return an error value if it fails. Unregister the previous gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Add pr_err() statements indicating the fail and error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/pc2/pc2_gpib.c | 38 ++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/staging/gpib/pc2= /pc2_gpib.c index 7b3b34f47341..a9aae563f60a 100644 --- a/drivers/staging/gpib/pc2/pc2_gpib.c +++ b/drivers/staging/gpib/pc2/pc2_gpib.c @@ -635,12 +635,42 @@ void pc2_2a_detach(gpib_board_t *board) =20 static int __init pc2_init_module(void) { - gpib_register_driver(&pc2_interface, THIS_MODULE); - gpib_register_driver(&pc2a_interface, THIS_MODULE); - gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); - gpib_register_driver(&pc2_2a_interface, THIS_MODULE); + int ret; + + ret =3D gpib_register_driver(&pc2_interface, THIS_MODULE); + if (ret) { + pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + return ret; + } + + ret =3D gpib_register_driver(&pc2a_interface, THIS_MODULE); + if (ret) { + pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pc2a; + } + + ret =3D gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); + if (ret) { + pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_cb7210; + } + + ret =3D gpib_register_driver(&pc2_2a_interface, THIS_MODULE); + if (ret) { + pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + goto err_pc2_2a; + } =20 return 0; + +err_pc2_2a: + gpib_unregister_driver(&pc2a_cb7210_interface); +err_cb7210: + gpib_unregister_driver(&pc2a_interface); +err_pc2a: + gpib_unregister_driver(&pc2_interface); + + return ret; } =20 static void __exit pc2_exit_module(void) --=20 2.34.1 From nobody Sun Feb 8 21:27:22 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 5B6121B4220 for ; Mon, 30 Dec 2024 19:10:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585822; cv=none; b=przQYhZQai0TSFJ1LrNHxparqaj9zu+McfHZEfvr5VqmAydjOlw1KhCO9I5gKxyDAqiVsPFzEj9+ZPYq4UMz4I/bEcxrFDrthQbuF9y47m7u1ewWyosZqHSxEpAc24dy1FwgMAMyjSykari//ihJJkNN2i5FIJxTNNO4YpAIWnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735585822; c=relaxed/simple; bh=FdOBvm07WRhrc8V9WZ8IHPlwLxj3SskqRFpD13/zpOI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ujUJ++cwdWcUbl8CTCGelb/QiU8C22UzgKo0QZzFvesxFSO0A/eYbtWcnKAPS5+6h6A8ZytXDk0T2f0jPV3Z9j3YxyWwG4I4l8TNkoC/ma6fm9bA+fyZTMmfRVmP4cULvkJMae+LcApY3ZDgkETJTRU20XmhBJAST00vKV2QwNU= 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=GqxJ+Z+9; arc=none smtp.client-ip=209.85.214.177 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="GqxJ+Z+9" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-215607278acso10737315ad.1 for ; Mon, 30 Dec 2024 11:10:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735585821; x=1736190621; 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=FuC1Eh4GEIAGfeAVn4Tmrg5GI4z8tK+6QbisFE+dYUM=; b=GqxJ+Z+9yc2mSNxUeBeEzIpHPmh8+Tq6Vc9HHKFzrPBKDU9tas0fwjRqtIXcpPEIMa XLV5kXcZFh13zBqW3jHa6BlthKwgmsxu+dm4cicwez+FsMGGpNcp/6+3FOkAdVtcGl/e DobEthKfS5wZ6Mvwrlk2SPPY8YkDGEUL6Cr/5JfZ/bgtmrOHaXrqeTgnV3CYIDj4c3zo yuOdeLyzjweylyqnau4Hlnag0cCiQtMUj+8AEjQsjkMzQW9DYK2cV89mAFrydhltABEP CyUFfDu9ydyv7u9jTMLzGAwGWKpUW9/gPZcq0OntYRP9qDYX2mYsGhzClDLOISKA8qvM 8rvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735585821; x=1736190621; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FuC1Eh4GEIAGfeAVn4Tmrg5GI4z8tK+6QbisFE+dYUM=; b=i7CWMTakmeHtawX5HplNmCa0Sr31flPPJDavl6SwPH34XFFggPrdqgNnGfEo9iBImF ZbzK0J2EhFGbkE1z1sIxAaE8QSuPSUwL3BBJg+gn4fE5M6JaKeze+wfJoQ19p8QLFUj/ rR/mcQYUb/YfjEq3OurVKXJ10VoD2/8bfZAf3pXngnJ/EWPvP21YkW2GswBl082n2Mzi Zzmrfgo8S+HOA9txK2Nq8AAE7GpHbzXPkx4f8qVnQqNBDd3vhGLOlohGjjHdMT2MLVqR fLcotMboKcUdBae881rUPOccJHp2Ir9jPiUrQp8uAZHx+TVU7z0G9qwvFhEY0LvR8Ki5 wKiQ== X-Forwarded-Encrypted: i=1; AJvYcCUCVr/BPKA4fvGD+49Z4m4zqc3yrv++/r4yQC+WwA2wE1Y5DEX+1G/HeZZm9LQxfZ+vXPBLdmLmbNdt+YE=@vger.kernel.org X-Gm-Message-State: AOJu0Yyhmtt5YyhGPNevEwdz+n9aue+/nNabek2CtHiij3DuCjIZq/Qg YmVC155P7GzOxpaULjkMppL9JzwFm1Krzqoh8LhpNi30ujKpf39fU0BXZg== X-Gm-Gg: ASbGncs5K6jR5rl+bKeXeOL3JPBWgcAzAYd9VNJ8AUZqH/yPWfi+Yr1wfWvqqlZM37p J43yDvbpiqnZde0KX1ecY7dW/A1TIinkDM1Em5TqBEX98jh8b6oHKDYiZp3mp+JnFxWdCAia+IF jVVaT7csiU8cPpBONpCkGtWE2JvYHCrvSJ8/kx7C68dTt5+Br3Kx7V7MV7qHHPPGjZnQggKbq1K fs4a4F6tpEkJTkDS+0f9LzX6NjRVSRGBXbBL48UFujD09nIzKOKXYg= X-Google-Smtp-Source: AGHT+IGfpqExbRHhT2oGTBmtIB59layh645hggslp/7+X7S0rB9BspfBOlWo2UqWWUp2+bSyttdBJQ== X-Received: by 2002:a17:902:e810:b0:216:69ca:772f with SMTP id d9443c01a7336-219e6f1db82mr190732765ad.14.1735585820739; Mon, 30 Dec 2024 11:10:20 -0800 (PST) Received: from ice.. ([171.76.81.193]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc964f09sm182886795ad.26.2024.12.30.11.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:10:20 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v6 15/15] staging: gpib: tnt4882: Handle gpib_register_driver() errors Date: Tue, 31 Dec 2024 00:26:35 +0530 Message-Id: <20241230185633.175690-16-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com> References: <20241230185633.175690-1-niharchaithanya@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: quoted-printable Content-Type: text/plain; charset="utf-8" The error value from the init_ni_gpib_cs() function is not returned and the previous registering functions are not unregistered. The function gpib_register_driver() can fail and similar to pcmcia_register_driver() function failing, the previous registering functions are not unregistered. Unregister the gpib and pci register functions if the subsequent gpib or pcmcia register functions fail and return the error value. Add pr_err() statements indicating the fail and the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 106 +++++++++++++++++--- 1 file changed, 93 insertions(+), 13 deletions(-) diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/= gpib/tnt4882/tnt4882_gpib.c index e49a952fa0d8..a2549231525b 100644 --- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c +++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c @@ -1524,29 +1524,109 @@ static int __init tnt4882_init_module(void) =20 result =3D pci_register_driver(&tnt4882_pci_driver); if (result) { - pr_err("tnt4882: pci_driver_register failed!\n"); + pr_err("tnt4882_gpib: pci_register_driver failed: error =3D %d\n", resul= t); return result; } =20 - gpib_register_driver(&ni_isa_interface, THIS_MODULE); - gpib_register_driver(&ni_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&ni_nat4882_isa_interface, THIS_MODULE); - gpib_register_driver(&ni_nat4882_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&ni_nec_isa_interface, THIS_MODULE); - gpib_register_driver(&ni_nec_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&ni_pci_interface, THIS_MODULE); - gpib_register_driver(&ni_pci_accel_interface, THIS_MODULE); + result =3D gpib_register_driver(&ni_isa_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_isa; + } + + result =3D gpib_register_driver(&ni_isa_accel_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_isa_accel; + } + + result =3D gpib_register_driver(&ni_nat4882_isa_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_nat4882_isa; + } + + result =3D gpib_register_driver(&ni_nat4882_isa_accel_interface, THIS_MOD= ULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_nat4882_isa_accel; + } + + result =3D gpib_register_driver(&ni_nec_isa_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_nec_isa; + } + + result =3D gpib_register_driver(&ni_nec_isa_accel_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_nec_isa_accel; + } + + result =3D gpib_register_driver(&ni_pci_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_pci; + } + + result =3D gpib_register_driver(&ni_pci_accel_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_pci_accel; + } + #ifdef GPIB_PCMCIA - gpib_register_driver(&ni_pcmcia_interface, THIS_MODULE); - gpib_register_driver(&ni_pcmcia_accel_interface, THIS_MODULE); - if (init_ni_gpib_cs() < 0) - return -1; + result =3D gpib_register_driver(&ni_pcmcia_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_pcmcia; + } + + result =3D gpib_register_driver(&ni_pcmcia_accel_interface, THIS_MODULE); + if (result) { + pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + goto err_pcmcia_accel; + } + + result =3D init_ni_gpib_cs(); + if (result) { + pr_err("tnt4882_gpib: pcmcia_register_driver failed: error =3D %d\n", re= sult); + goto err_pcmcia_driver; + } #endif =20 mite_init(); mite_list_devices(); =20 return 0; + +#ifdef GPIB_PCMCIA +err_pcmcia_driver: + gpib_unregister_driver(&ni_pcmcia_accel_interface); +err_pcmcia_accel: + gpib_unregister_driver(&ni_pcmcia_interface); +err_pcmcia: +#endif + gpib_unregister_driver(&ni_pci_accel_interface); +err_pci_accel: + gpib_unregister_driver(&ni_pci_interface); +err_pci: + gpib_unregister_driver(&ni_nec_isa_accel_interface); +err_nec_isa_accel: + gpib_unregister_driver(&ni_nec_isa_interface); +err_nec_isa: + gpib_unregister_driver(&ni_nat4882_isa_accel_interface); +err_nat4882_isa_accel: + gpib_unregister_driver(&ni_nat4882_isa_interface); +err_nat4882_isa: + gpib_unregister_driver(&ni_isa_accel_interface); +err_isa_accel: + gpib_unregister_driver(&ni_isa_interface); +err_isa: + pci_unregister_driver(&tnt4882_pci_driver); + + return result; } =20 static void __exit tnt4882_exit_module(void) --=20 2.34.1