From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C860A8F57 for ; Sun, 16 Jul 2023 20:44:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E04CC433C8; Sun, 16 Jul 2023 20:44:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689540251; bh=E+YcrebRQaXi9dwIGnt21s4qjKTO3OnIq/BPILOg8VM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SmDvXMQ2djtqXdWkW1WpczzKeiuOZB+Jy/Squi3I5sQD7/RGtDAdOanE+6XjpH9Ek eUSaYif7HBnfDNZ37bxJT6YRnowDXkQhQBm4DuWkKJi5rp3EyJXzc81tIXWf8msEZo 6/HIDlJLnmt4W/ofAoS8FCmkAl5KYxhRpkjMwxpo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sui Jingfeng , Bjorn Helgaas , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 6.1 297/591] PCI: Add pci_clear_master() stub for non-CONFIG_PCI Date: Sun, 16 Jul 2023 21:47:16 +0200 Message-ID: <20230716194931.582118965@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230716194923.861634455@linuxfoundation.org> References: <20230716194923.861634455@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Sui Jingfeng [ Upstream commit 2aa5ac633259843f656eb6ecff4cf01e8e810c5e ] Add a pci_clear_master() stub when CONFIG_PCI is not set so drivers that support both PCI and platform devices don't need #ifdefs or extra Kconfig symbols for the PCI parts. [bhelgaas: commit log] Fixes: 6a479079c072 ("PCI: Add pci_clear_master() as opposite of pci_set_master()") Link: https://lore.kernel.org/r/20230531102744.2354313-1-suijingfeng@loongson.cn Signed-off-by: Sui Jingfeng Signed-off-by: Bjorn Helgaas Reviewed-by: Geert Uytterhoeven Signed-off-by: Sasha Levin --- include/linux/pci.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/pci.h b/include/linux/pci.h index d20695184e0b9..9f617ffdb863f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1809,6 +1809,7 @@ static inline int pci_dev_present(const struct pci_device_id *ids) #define pci_dev_put(dev) do { } while (0) static inline void pci_set_master(struct pci_dev *dev) { } +static inline void pci_clear_master(struct pci_dev *dev) { } static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; } static inline void pci_disable_device(struct pci_dev *dev) { } static inline int pcim_enable_device(struct pci_dev *pdev) { return -EIO; } -- 2.39.2