From nobody Sat Jul 25 20:04:12 2026 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 B74C2380FF2 for ; Tue, 14 Jul 2026 02:50:27 +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=1783997429; cv=none; b=ayb6JDQjsH9OqPdrubrZT0DmxUeMpGMO4OhDOxOLvOSDWuSNNmRa0kM60w+VxsdY8Vc/m1NHgxpghSjMHZIHVxmgq6SPr4vXq55TqaKmM8FQgHl/+qb+1YKGjsk59Aeo0T+jSwrnIc84kcv1rB3+eYcdhieAjFqeON01emkDwoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783997429; c=relaxed/simple; bh=W1US6YMeRRFIMqJGrPECOmPpclqixtZwnexEZGa9u3c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fbXvcONldOcDo/XovHMXo6TyN3ebcrXUQ42KLK8hhHh2xygdsurkrMoibd+Y/U3TmvbwQbNCKc8Br1AN6HKFErBRQqt0ZB81mh7LZCb6zmgDGlZjYkv8iOV9eDkBgpqaVYZhNV1LaG4WTwQ5qdPH8Ibj5A4YbNhdFPLlNfQt6ps= 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=SLGrbaug; 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="SLGrbaug" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-3811f512167so4516550a91.3 for ; Mon, 13 Jul 2026 19:50:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783997427; x=1784602227; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=HrxRhhy3X5yX0r/S8phFrv3Mv9+xuvAOBsGoQ3db/xs=; b=SLGrbaugCO1LBbphHryaXbEu8xagFgzQ/8oxsuGM/sDp8cGSbyukvInVAmP58UW0bm 0FYubmSCL0C82EVjK64KcW6oBm7l7QuKhfQgjU9MYzRAGOU/LxFVx8BQrMQHjon10FWo wZCMtwcbKy9qSkRygbuo2EUglfEw3nUjUNUlLJT+KqL8yYuh0poXye0akHYPYhZK1Q/a yS/G4nDYDhJA9G1a1bevvf+Q1ua43NGsU9BKRMpgvt5vO8HdnyvE3zl/2YQVcRZn6YLL kBlcAXqpjWvZF/abdM2KkmA7G5WPlWLTUpKSKbf6NpSMMUNjnaXCUqSKhqUojl5AKUOC x8dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783997427; x=1784602227; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HrxRhhy3X5yX0r/S8phFrv3Mv9+xuvAOBsGoQ3db/xs=; b=FfIGqb+fQymZi+R4jU2g3iQ+nCj2F+iPFiuxHI6l4Vcbc42dfF82eRdFcMBS9b9MAI 7qd5z1AWWogrWkzUNGP5uiqbQHANnGFVWZlZi3u9jjKXviEqz6tH0V/nEN0nWora/uKX DNZf6ayBMvFVK5Flkw6gtUG34PAyIhat6mji5NZeFPHiCD2ENkeGvOl8VCHKgG/k/NaC O0BCtdcz7sRQC4Og00jqpEbPl0RqvdShOSAphBW0hbiwQlmvk0dVHZOUv1O6TvePyEG4 qyLNLnH/lngd/2HqwyrAAhxP8BOq0SFil3KgJuyNBo6kqcICv4cPkwFPXpKIDSppb9bJ YtSg== X-Gm-Message-State: AOJu0YxX77ayBGXMpZRrY/c19lwdBM+AZ1I5vrvztbj/LXCR3vmxu06+ 5vAK4Id01FnBr8OAP/Ig0IVh1OjB97eJYFnuG7r+l31VSXChjW4x2hDADwU15A== X-Gm-Gg: AfdE7ck0uce4+cPwx+j5jDwGE+0W971cIPndvFgUmz0RrjlHXaV1b2zdH5fsrQd0F1a 7FkdXXEz9z/1Xmzk0EfKfUBaue5ncysRGvPcjvsqG2zikxLVW5UqF6sbX6/LNQDmhbCQIklk+F4 AX1poRyvpFkDnWyqqOOneOdNCRroWjwbk7FP/djqGkUsSffElSg3dMMh+rpF9NBDbMH2LM+CmNY cmOMAK4s0r7tKwJFyGXJLk2KezBTJS8Xv1PtR6YwnBIZ/LW48xVnFNQQgmeTCiIn4IHRJsgN7RJ pkxxsGLps6saL8iiiySUhe48At6VpOFNKQAamfmYWfY9QFvjSxHsW/t29Fad7983FRMn4NilTT5 kyrL8AIHeyFQV7qXkyvteEuwSTuAel1+iO0eWTeGgHEEHmtLST96jmkMjoGJtRD3d0LcJFhIMZ/ Pwe/AzQOiTnRNqzF/ReriLzsceZZj7D/M9cbxqh8CRGFDjjfFeEy0gtMTBpmZfBZKgYjLNng6PO kRjDObTX4i3V9oaioKJdbaZqIr7KGJQ/8hugW2SLiTIv5bZgKAb1/4x2RwY0mTP1g== X-Received: by 2002:a17:90b:4a:b0:388:cf45:d72c with SMTP id 98e67ed59e1d1-38e1aedd604mr645160a91.15.1783997427003; Mon, 13 Jul 2026 19:50:27 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38e172fd17asm707953a91.12.2026.07.13.19.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 19:50:26 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH] misc: keba: cp500: use pcim_enable_device() Date: Mon, 13 Jul 2026 19:50:25 -0700 Message-ID: <20260714025025.2055506-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 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" Switch from pci_enable_device() to pcim_enable_device() so the PCI device is automatically disabled on probe error and driver removal. Drop the now redundant manual pci_disable_device() and pci_clear_master() calls, since pcim's release path clears bus mastering and disables the device. Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev --- drivers/misc/keba/cp500.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/misc/keba/cp500.c b/drivers/misc/keba/cp500.c index 6c65fbf22e75..c2ca63e40814 100644 --- a/drivers/misc/keba/cp500.c +++ b/drivers/misc/keba/cp500.c @@ -887,7 +887,7 @@ static int cp500_probe(struct pci_dev *pci_dev, const s= truct pci_device_id *id) else return -ENODEV; =20 - ret =3D pci_enable_device(pci_dev); + ret =3D pcim_enable_device(pci_dev); if (ret) return ret; pci_set_master(pci_dev); @@ -896,18 +896,15 @@ static int cp500_probe(struct pci_dev *pci_dev, const= struct pci_device_id *id) startup.end =3D startup.start + cp500->devs->startup.size - 1; cp500->system_startup_addr =3D devm_ioremap_resource(&pci_dev->dev, &startup); - if (IS_ERR(cp500->system_startup_addr)) { - ret =3D PTR_ERR(cp500->system_startup_addr); - goto out_disable; - } + if (IS_ERR(cp500->system_startup_addr)) + return PTR_ERR(cp500->system_startup_addr); =20 cp500->msix_num =3D pci_alloc_irq_vectors(pci_dev, CP500_NUM_MSIX_NO_MMI, CP500_NUM_MSIX, PCI_IRQ_MSIX); if (cp500->msix_num < CP500_NUM_MSIX_NO_MMI) { dev_err(&pci_dev->dev, "Hardware does not support enough MSI-X interrupts\n"); - ret =3D -ENODEV; - goto out_disable; + return -ENODEV; } =20 cp500_vers =3D ioread32(cp500->system_startup_addr + CP500_VERSION_REG); @@ -937,9 +934,6 @@ static int cp500_probe(struct pci_dev *pci_dev, const s= truct pci_device_id *id) nvmem_unregister_notifier(&cp500->nvmem_notifier); out_free_irq: pci_free_irq_vectors(pci_dev); -out_disable: - pci_clear_master(pci_dev); - pci_disable_device(pci_dev); =20 return ret; } @@ -962,9 +956,6 @@ static void cp500_remove(struct pci_dev *pci_dev) pci_set_drvdata(pci_dev, 0); =20 pci_free_irq_vectors(pci_dev); - - pci_clear_master(pci_dev); - pci_disable_device(pci_dev); } =20 static struct pci_device_id cp500_ids[] =3D { --=20 2.55.0