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