Commit e0f7b192 authored by Krzysztof Wilczyński's avatar Krzysztof Wilczyński Committed by Bjorn Helgaas
Browse files

PCI: Use kstrtobool() directly, sans strtobool() wrapper 

strtobool() is a wrapper around kstrtobool() that has been added for
backward compatibility.

There is no reason to use the old API, so use kstrtobool() directly.

Related: ef951599 ("lib: move strtobool() to kstrtobool()")

Link: https://lore.kernel.org/r/20210915230127.2495723-3-kw@linux.com


Signed-off-by: default avatarKrzysztof Wilczyński <kw@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 36f354ec

drivers/pci/p2pdma.c

+3 −3
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ EXPORT_SYMBOL_GPL(pci_p2pdma_unmap_sg_attrs); 
 *

 * Parses an attribute value to decide whether to enable p2pdma.

 * The value can select a PCI device (using its full BDF device

 * name) or a boolean (in any format strtobool() accepts). A false

 * name) or a boolean (in any format kstrtobool() accepts). A false

 * value disables p2pdma, a true value expects the caller

 * to automatically find a compatible device and specifying a PCI device

 * expects the caller to use the specific provider.
@@ -975,11 +975,11 @@ int pci_p2pdma_enable_store(const char *page, struct pci_dev **p2p_dev, 
	} else if ((page[0] == '0' || page[0] == '1') && !iscntrl(page[1])) {

		/*

		 * If the user enters a PCI device that  doesn't exist

		 * like "0000:01:00.1", we don't want strtobool to think

		 * like "0000:01:00.1", we don't want kstrtobool to think

		 * it's a '0' when it's clearly not what the user wanted.

		 * So we require 0's and 1's to be exactly one character.

		 */

	} else if (!strtobool(page, use_p2pdma)) {

	} else if (!kstrtobool(page, use_p2pdma)) {

		return 0;

	}

drivers/pci/pcie/aspm.c

+2 −2
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ static ssize_t aspm_attr_store_common(struct device *dev, 
	struct pcie_link_state *link = pcie_aspm_get_link(pdev);

	bool state_enable;



	if (strtobool(buf, &state_enable) < 0)

	if (kstrtobool(buf, &state_enable) < 0)

		return -EINVAL;



	down_read(&pci_bus_sem);
@@ -1276,7 +1276,7 @@ static ssize_t clkpm_store(struct device *dev, 
	struct pcie_link_state *link = pcie_aspm_get_link(pdev);

	bool state_enable;



	if (strtobool(buf, &state_enable) < 0)

	if (kstrtobool(buf, &state_enable) < 0)

		return -EINVAL;



	down_read(&pci_bus_sem);