From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 A69AE78F20 for ; Sat, 28 Dec 2024 06:25:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367155; cv=none; b=PbdkkfGbp58gNX/ao1NWgVlKU9y5G/kgze7FfSzy42CLBCabrlg2x51nYni+rVQ+rT0epgZBI7GgrM5KvnsEHgrg6GTNG797KSpIL1ND3q3Xz4JW3goDSMXksfg9shLQN4MS7u4wmnNZFsnJ7FWvdzGlC0sEfAkEXvl3lGMOwW8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367155; c=relaxed/simple; bh=Tutpev983z6EE15OjUi5XdAWR2lrO2rhXSSiQQA3rHs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f5a2VR+6QkCmjUPNfpxVcHtmqRrjwkm/BT0Quh5r0Kxyb5Agj1YN4ptn1XnR1snIeQmij+0wsfH3bZtcIsUVqfNBWHZoztf59NPgX+Tpw4HLNiaWXMa5O0Hl9DYlLkBKcvxtftSuuYI9dcKQ3ElnEBeFRl/CC2Xp5NWuB6JIHzg= 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=Syybj6xB; arc=none smtp.client-ip=209.85.216.50 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="Syybj6xB" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2ee534d6800so1538244a91.2 for ; Fri, 27 Dec 2024 22:25:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367153; x=1735971953; 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=tsT73hso6zzbcSoDclkqzX5laGnzjqz54vFNN1iVypE=; b=Syybj6xBrXSRBq2rccgTVe7+NZeMEsewMlTgVfHtwSXbuf6Ddym2okSGAteOOGZDHK 9ccQXkWRUYm1MCdpikJ5Qun8fFbKMQOWCsnOB0sFQY+5Iu2CZl85klHTEBgQ2bVv1sbh R7HAW6RABLG79+xw7HfAAfC9q+OJl1K55W2eDBaouGpyQ/MHxMkiKaDgaJFX6qtsrbti ujDWOq27bgiGZx887EuHstQfbb0S/bBcR4lOiSpM03ZqeieNiKXXL/fiYVBjZqZV22kk dFsjshlQcDF94y+5Vuu737j4v1REhGGHkW0Jns/CrWp23X/gp5ftLJlS6z6QebRaEMo8 Rtgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367153; x=1735971953; 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=tsT73hso6zzbcSoDclkqzX5laGnzjqz54vFNN1iVypE=; b=t1Knzwm//hd/3P/wyN6x4V9l/yTk2VVrPHM9OvmTzfSKgd52XobtlruID+H7ECISMC kJIHr2qia3ebAfS9mDqjkFlW7cXpw01ViBi+f66T/CySF9lBenCUX1pttFspl60geYpG 6gyLRX6T0c5d2OngdbCKaF327p4Wpkqsemx6qthjhMCsXXH0eCH5Jzk0k8XSVj3xPhOK FGGonDSvbl+SSkZ5wiwUZthinXERy2i1rDTys97uTOV4COxNjK0zVy8BHl51rv7i7YZi BdkGlGT3fqtjlE8P1IAHTxYxd7SnJf+nHwWyKwRnMGB0ezvjWf0pk6dQdXlUHAE7vHty 5KlQ== X-Forwarded-Encrypted: i=1; AJvYcCVGOHpXkyn59yrV2vXg6KPwe1cIZTzzOvmlly8CNjvJdxSErhTWkD80Kh6/YObMKrXXV01olWgydXZNxvc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/BV1TWm75yR+S2AxQHPX3oKIMkqXrvVw1Clix5n7sfYw2qe4y MHnAYae2wCgWgxWciUJO3efLlhKdJAIpfk6+s52hxcKg2iesQQlk X-Gm-Gg: ASbGncvTphmnXY0EcssAkzNZ4od7Npa9IevOIt/W6Kv21y9K0yUoonlKBMqOcY+YSj2 MzUlZrDSTIP6rqU2bsM1ygOl01dy9LMxoQQf5/uBy5op6zgOpHX/299YQYifm/k9e5SRdXvI74m qiEdHr3y5b/TGUYwM3dDhdp6olRxlbxtEwzaVdb5PJSCm8UU894jdwodyGdxKKL1+TmzJ5kThUi XLVSkT7kE0rhisdpxFynUaSJDq7bIh93uiU30bZkGmmoerlgI6+IH8= X-Google-Smtp-Source: AGHT+IF0Pe30NOhHyAAIhuU6W6LxnWszRwVxuCpdG8J1K9xDRtKCOXb/KZKzensDsAwu0MMfuXptFQ== X-Received: by 2002:a17:903:2a8c:b0:215:9a73:6c4f with SMTP id d9443c01a7336-219e6e9de89mr155301085ad.6.1735367152936; Fri, 27 Dec 2024 22:25:52 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:25:52 -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 v5 04/15] staging: gpib: cb7210: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:52 +0530 Message-Id: <20241228060800.107653-5-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241228060800.107653-1-niharchaithanya@gmail.com> References: <20241228060800.107653-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: 8bit 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 | 99 ++++++++++++++++++++-------- 1 file changed, 73 insertions(+), 26 deletions(-) diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb7210/cb7210.c index 63df7f3eb3f3..99041ee007bb 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 = { .resume = cb_gpib_resume, }; -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,85 @@ void cb_pcmcia_detach(gpib_board_t *board) static int __init cb7210_init_module(void) { - int err = 0; - int result; + int ret; - result = pci_register_driver(&cb7210_pci_driver); - if (result) { - pr_err("cb7210: pci_driver_register failed!\n"); - return result; + ret = pci_register_driver(&cb7210_pci_driver); + if (ret) { + pr_err("cb7210: pci_driver_register failed: error = %d\n", ret); + return ret; } - 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 += cb_pcmcia_init_module(); + ret = gpib_register_driver(&cb_pci_interface, THIS_MODULE); + if (ret) + goto err_pci; + + ret = gpib_register_driver(&cb_isa_interface, THIS_MODULE); + if (ret) + goto err_isa; + + ret = gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE); + if (ret) + goto err_pci_accel; + + ret = gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pci_unaccel; + + ret = gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE); + if (ret) + goto err_isa_accel; + + ret = gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE); + if (ret) + goto err_isa_unaccel; + +#ifdef GPIB_PCMCIA + ret = gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE); + if (ret) + goto err_pcmcia; + + ret = gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_accel; + + ret = gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_unaccel; + + ret = pcmcia_register_driver(&cb_gpib_cs_driver); + if (ret) + goto err_pcmcia_driver; #endif - if (err) - return -1; + pr_info("cb7210: module init is complete\n"); return 0; + +#ifdef GPIB_PCMCIA +err_pcmcia_driver: + pr_err("ines: pcmcia_register_driver failed: error = %d\n", ret); + 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); + + pr_err("cb7210: gpib_register_driver failed!\n"); + return ret; } static void __exit cb7210_exit_module(void) -- 2.34.1