From nobody Mon Feb 9 14:32:00 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 C7251198E9B for ; Thu, 26 Dec 2024 19:49:19 +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=1735242561; cv=none; b=e5ag7USfuFLzPz/269JdfJ/qSNJpC1ifgPRTXL+L8UM7Iwt3GWm4kFZZv/R1GJVCXzzOJR2BBVSImWwZPALasT1XBrHgUrot1Jjv/tL5FP6gBwe9JKMllGAEdQ4r+IxgGLmzJ96LsV4Chfx1JR5Tz4cM4LSdh/RbJNI6ff9c4iI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735242561; c=relaxed/simple; bh=+ihw3GQCK6j9Ewtkfi1LzDB2HWpiS31z6aBWnAR32LU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EbEzJyo9BQ4jF2kkLfvlGwek3fL5tDRwEdRtroA3sX7e2FwflIsmllt09Usiv6gim7Sesk1RgClnCpjyuIFE5DwkmAF+gBu27eQcadvR2T1Wp8pZYH2dv9Vuq4OlbIYKplAqOI01IxxnyFLhbz9oV8ZMySi4MtN0wsM+dGndx8w= 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=Oqjrvyri; 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="Oqjrvyri" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-216513f8104so8882445ad.2 for ; Thu, 26 Dec 2024 11:49:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735242559; x=1735847359; 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=8CFtqKpL2xT789qBVaHSwRjKXZVp5JYOteyLFbQy5ho=; b=Oqjrvyri7roo+/X00Q4MERrbht4QTUYtOyw9R8/ZLYpEZM4Sxw0GC9bF3wRXgTxcof glMssXY1qS2JBVBBGs29PqAQ6I2WsbvzcZPb/jP5CFX2gv+k5ylwuriTQuh5JGs19YNe 037A3ycvaN2BHLfndpmVnI+aqLlzMOIYY79MCPeDbKBPE2w3s+HoEhvG5NPZDVdrml86 fEUwpeZmiV/ok6qwkVNrf3MvykaNMJtQcivqy8hmb1fOAFQyy6z/R4gpxv8KNsoRYFnl ELOwxPcSdvcQEEI3boccKhbgKotVEvdF/OeGUe8wZvjT/TkDue7C9rEyXMq0qFw3z9tI Hp0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735242559; x=1735847359; 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=8CFtqKpL2xT789qBVaHSwRjKXZVp5JYOteyLFbQy5ho=; b=Ix0OHDk9KTTlDbMcwNCyUDccrNh/+gvZq0VtsOQft09RlNgj88BI6NF2xQweA04uj0 w05Gu2DWRTfdrHA6woIzOgwivp9q7+dKCL60Y+ew6W264k+NyKBGt9CzIPYPBKoE5DMT rzZH2KbVosMbvGIzBAsFPpjyS7FeMG2/slrWH7NK63xn4PJRvBEwtQasA6pNfYFaCn+g rdkrj3trJscV2UcCBPa7VZ2WhHLT+drtF1NPNYnuJcxgUamqalEeX+T95y35L+htSa2D BiIGt6hSCqsgtsyJcnCuV3MRz7k7ONuxJpahovsI7GxQYvWvBOC/Za2txLH+gkX762b0 RcIA== X-Forwarded-Encrypted: i=1; AJvYcCVozEZpbkMziODgquJfTWMyHudfQK/1Q72owrBfjuUmQysbrA+ugLhdT9r1pv0o2WU4GOgXIej8kIyR37U=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8R8uHLT8erPLMs00+nOn/wAeKwqcceY+dJt+hcDk9TpjTsg67 iQwr9MLiFnNdpMGSNADm/sG5kA7+uw63ki7xf1rq306tXxNmI7EI X-Gm-Gg: ASbGnctta2/DWKPGBvZjhaieSf/XJG2SruK8+Ua5XAy//u9k0uhcsqs2oE5m2ci4QYq 9xVXm//dXNW4anzMnrc/kOLUhbFVMh4mB/QSSLbES/0aL/yeYMJ0yAJkw7F71uE2iiFb4aDW1R+ ktlHu1rHuK030m7qE/rhBQji2MELTkigF4tXBwm8Oxtw+8LR0d9xZqM/LacIcKGPmJva8y5W44g QfTO8L+inrKBuSujUam71u7esqAAt2POwRBCsNhhX39g1v5CSt86g4= X-Google-Smtp-Source: AGHT+IFKmz/sisepMc8kR9hLoE13n/o2Jq2Jywmwrtud0r0I/5KQYcu5HoEF6ZT1XonOYEYFApW3wQ== X-Received: by 2002:a05:6a21:178a:b0:1d8:a203:95a4 with SMTP id adf61e73a8af0-1e5e0481626mr15627422637.5.1735242559217; Thu, 26 Dec 2024 11:49:19 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842e35d4becsm10304580a12.79.2024.12.26.11.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2024 11:49:18 -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 v4 04/15] staging: gpib: cb7210: Handle gpib_register_driver() errors Date: Fri, 27 Dec 2024 01:06:28 +0530 Message-Id: <20241226193637.241049-5-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241226193637.241049-1-niharchaithanya@gmail.com> References: <20241226193637.241049-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. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/cb7210/cb7210.c | 96 ++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 27 deletions(-) diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb= 7210/cb7210.c index 63df7f3eb3f3..1b7eb9cabcbd 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,80 @@ void cb_pcmcia_detach(gpib_board_t *board) =20 static int __init cb7210_init_module(void) { - int err =3D 0; - int result; + int ret; =20 - result =3D pci_register_driver(&cb7210_pci_driver); - if (result) { - pr_err("cb7210: pci_driver_register failed!\n"); - return result; - } + ret =3D pci_register_driver(&cb7210_pci_driver); + if (ret) + return ret; + + ret =3D gpib_register_driver(&cb_pci_interface, THIS_MODULE); + if (ret) + goto err_pci; + + ret =3D gpib_register_driver(&cb_isa_interface, THIS_MODULE); + if (ret) + goto err_isa; + + ret =3D gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE); + if (ret) + goto err_pci_accel; + + ret =3D gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pci_unaccel; + + ret =3D gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE); + if (ret) + goto err_isa_accel; + + ret =3D gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE); + if (ret) + goto err_isa_unaccel; + +#ifdef GPIB_PCMCIA + ret =3D gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE); + if (ret) + goto err_pcmcia; + + ret =3D gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_accel; + + ret =3D gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_unaccel; =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 pcmcia_register_driver(&cb_gpib_cs_driver); + if (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