From patchwork Mon Dec 9 13:06:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13899647 X-Patchwork-Delegate: bhelgaas@google.com Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6691230D3B for ; Mon, 9 Dec 2024 13:07:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733749622; cv=none; b=DJLg/oVh3Y9CLX7hqeVHG+Aj56H5DgEzCHDCdCjU/iZrJww6djckEZHa+SNXVkbOooXvLCrSUWAGYihh4uArYqgf5SngrJhC17YcuntGQI0vboXNjXbdPYHmtw9ed8e6SJhiuJCiNBx/+Sg0sCUjyNIIQQSd3r+eCaiiETvZjDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733749622; c=relaxed/simple; bh=p0/gWxUTpmVAZUhoNYoMEndzzz2nBwZ50lbcwipiIRI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qOJ7Zys3JnzA6X93jD+RG272la+4WiTyV5Ba8gMQ6qu3Il7ficnj1gQMD0JG9S0lmsRWcuijbzQhfTk1r9aB+F7KhY+dCK/bcsKKVus4o+NhtxQa+SK1nBDjys4yaQxjXfSXKvClvDsUmHMlgyddwQYPCmETVKi4CHM+V3I7Q6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dwWl5iwl; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dwWl5iwl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733749619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iGrvh/xDUNx0Zym0wN3Xe7A7dJtO5ZhSWVvmuSF27ww=; b=dwWl5iwlNfK4HpayhkJY8gEqlb+J2xqqrX0DthLOq6FpUWQB46pQNI7fjeaCUbTpXlrzSx aRveV0/udLktiAG0Orrhdf/azFrSGCgwvlIUkCe+4V3Ua8UONJRulYOUcXSBYtLCc7+YjU RpuDOEZzNWPLkIjdJVU1123CZ9R45hg= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-128-FNZVcN2DOW-t2kIcdxNEXw-1; Mon, 09 Dec 2024 08:06:58 -0500 X-MC-Unique: FNZVcN2DOW-t2kIcdxNEXw-1 X-Mimecast-MFC-AGG-ID: FNZVcN2DOW-t2kIcdxNEXw Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-386333ea577so774667f8f.1 for ; Mon, 09 Dec 2024 05:06:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733749617; x=1734354417; 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=iGrvh/xDUNx0Zym0wN3Xe7A7dJtO5ZhSWVvmuSF27ww=; b=forZsXv+XOLNp4qkaNac8VSKYDk1P/pZfSKWZcxD+I9mrbaO9PuSwyO0dQOJR/Ijxs 7KoxGeyOkNy39JIQu4X/fLj1L5Ska5IHMZYwu9Tm28Q1u95vd52Cc7qS1aT4FxNjcxU3 M9k2tckJvPa0dSAToFxVFC6hpXvXRQLYezl+ztwqqAhrx5q5V/4VAYax3bkQvnxsWM2J kyDjGcWNxbwozjOuUTr4hdeJZIaEMV7Gi67O8wI+VkZdIblKSOPR+GVzvEZzIY6z6daj BaPJKUDSN1Vfi1LNZLZse5gMP7ElPUffxsBbb7bSosk/6IUvrg7uIruPBnx3Cum/kUg7 uD3Q== X-Forwarded-Encrypted: i=1; AJvYcCUxIK5f9KZRDSW0q1hSv1pxwRkGLPzna1MvY8sjwOwRgvVYyAa1WU3oLOjBPN0VwJApeIulgL5qeS4=@vger.kernel.org X-Gm-Message-State: AOJu0YzBcxdchEXCGTzwSX8/yWNwMAZpnp2DM2mMljBKEgax5/PWLJlQ qxfMM6IRCs84v085jlKrXZVo1nFLSYmP4FX32ZvHzAqTZYnXhiRvELA85/5cPkqmVmx5vnaZCxM cDMVHqR+caD2ie3B6jdT0EBeKxwx5pFwGdoHMimiLAyIpDbTsUhHpS/tDjA== X-Gm-Gg: ASbGncuduPipifMB8stSHhcIamUUV8XMH9GkG4M3jIjChzGknxerv9VuubqSlHkoLy6 4KVLp1NyMsMUeYc+LqWlF/nJA6mkRoJ2gXWz0ah/qaaX8cW8p5PJ4Yv+gleQPIsjlrPCLBPZdE0 bLLHvKV2bm076uUzES3V2yXK3yJhIrqJG/ZY63D7OMMfJLz4OjCjSAMr1HTMR847naO9OiY05Ff Wik7gadsnStDhLY4tk/C5+EXlM95/Yxhj4BditXEAVd3BTr18gArwtsWy7kHvBB3+cTVHdaueCD 9grbLevi X-Received: by 2002:a5d:47c9:0:b0:385:db11:badf with SMTP id ffacd0b85a97d-386453d6c46mr225638f8f.22.1733749617400; Mon, 09 Dec 2024 05:06:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+w+VXnhTGgYCQrqoxE7Q0eQycE2/xL59lBRJp9LXmIJ3oiAACyABfaofCQ1IoSgKVucKxLg== X-Received: by 2002:a5d:47c9:0:b0:385:db11:badf with SMTP id ffacd0b85a97d-386453d6c46mr225568f8f.22.1733749616959; Mon, 09 Dec 2024 05:06:56 -0800 (PST) Received: from eisenberg.redhat.com (nat-pool-muc-u.redhat.com. [149.14.88.27]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3862190965asm13200127f8f.82.2024.12.09.05.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 05:06:56 -0800 (PST) From: Philipp Stanner To: amien Le Moal , Niklas Cassel , Basavaraj Natikar , Jiri Kosina , Benjamin Tissoires , Arnd Bergmann , Greg Kroah-Hartman , Alex Dubov , Sudarsana Kalluru , Manish Chopra , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rasesh Mody , GR-Linux-NIC-Dev@marvell.com, Igor Mitsyanko , Sergey Matyukevich , Kalle Valo , Sanjay R Mehta , Shyam Sundar S K , Jon Mason , Dave Jiang , Allen Hubbe , Bjorn Helgaas , Alex Williamson , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Mario Limonciello , Chen Ni , Philipp Stanner , Ricky Wu , Al Viro , Breno Leitao , Thomas Gleixner , Kevin Tian , Andy Shevchenko , Mostafa Saleh , Jason Gunthorpe , Yi Liu , Kunwu Chan , Dan Carpenter , "Dr. David Alan Gilbert" , Ankit Agrawal , Reinette Chatre , Eric Auger , Ye Bin Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ntb@lists.linux.dev, linux-pci@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH v3 05/11] misc: Use never-managed version of pci_intx() Date: Mon, 9 Dec 2024 14:06:27 +0100 Message-ID: <20241209130632.132074-7-pstanner@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241209130632.132074-2-pstanner@redhat.com> References: <20241209130632.132074-2-pstanner@redhat.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pci_intx() is a hybrid function which can sometimes be managed through devres. To remove this hybrid nature from pci_intx(), it is necessary to port users to either an always-managed or a never-managed version. cardreader/rtsx_pcr.c and tifm_7xx1.c enable their PCI-Device with pci_enable_device(). Thus, they need the never-managed version. Replace pci_intx() with pci_intx_unmanaged(). Signed-off-by: Philipp Stanner Acked-by: Greg Kroah-Hartman --- drivers/misc/cardreader/rtsx_pcr.c | 2 +- drivers/misc/tifm_7xx1.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index be3d4e0e50cc..e25e6d560dd7 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -1057,7 +1057,7 @@ static int rtsx_pci_acquire_irq(struct rtsx_pcr *pcr) } pcr->irq = pcr->pci->irq; - pci_intx(pcr->pci, !pcr->msi_en); + pci_intx_unmanaged(pcr->pci, !pcr->msi_en); return 0; } diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c index 1d54680d6ed2..5f9c7ccae8d2 100644 --- a/drivers/misc/tifm_7xx1.c +++ b/drivers/misc/tifm_7xx1.c @@ -327,7 +327,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev, goto err_out; } - pci_intx(dev, 1); + pci_intx_unmanaged(dev, 1); fm = tifm_alloc_adapter(dev->device == PCI_DEVICE_ID_TI_XX21_XX11_FM ? 4 : 2, &dev->dev); @@ -368,7 +368,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev, err_out_free: tifm_free_adapter(fm); err_out_int: - pci_intx(dev, 0); + pci_intx_unmanaged(dev, 0); pci_release_regions(dev); err_out: if (!pci_dev_busy) @@ -392,7 +392,7 @@ static void tifm_7xx1_remove(struct pci_dev *dev) tifm_7xx1_sock_power_off(tifm_7xx1_sock_addr(fm->addr, cnt)); iounmap(fm->addr); - pci_intx(dev, 0); + pci_intx_unmanaged(dev, 0); pci_release_regions(dev); pci_disable_device(dev);