From nobody Mon Feb 9 23:38:26 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