From: Prarit Bhargava <prarit@xxxxxxxxxx>
[redhat] drivers/pci: Remove RHEL-only pci_hw_*() functions
Remove the RHEL-only pci_hw_*() functions. These will be replaced with
new functions in a later commit.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
Signed-off-by: Scott Weaver <scweaver@xxxxxxxxxx>
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index blahblah..blahblah 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -297,83 +297,6 @@ static struct attribute *pci_drv_attrs[] = {
};
ATTRIBUTE_GROUPS(pci_drv);
-#ifdef CONFIG_RHEL_DIFFERENCES
-/**
- * pci_hw_deprecated - Tell if a PCI device is deprecated
- * @ids: array of PCI device id structures to search in
- * @dev: the PCI device structure to match against
- *
- * Used by a driver to check whether this device is in its list of deprecated
- * devices. Returns the matching pci_device_id structure or %NULL if there is
- * no match.
- *
- * Reserved for Internal Red Hat use only.
- */
-const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids,
- struct pci_dev *dev)
-{
- const struct pci_device_id *ret = pci_match_id(ids, dev);
-
- if (!ret)
- return NULL;
-
- mark_hardware_deprecated(dev_driver_string(&dev->dev), "%04X:%04X @ %s",
- dev->device, dev->vendor, pci_name(dev));
- return ret;
-}
-EXPORT_SYMBOL(pci_hw_deprecated);
-
-/**
- * pci_hw_unmaintained - Tell if a PCI device is unmaintained
- * @ids: array of PCI device id structures to search in
- * @dev: the PCI device structure to match against
- *
- * Used by a driver to check whether this device is in its list of unmaintained
- * devices. Returns the matching pci_device_id structure or %NULL if there is
- * no match.
- *
- * Reserved for Internal Red Hat use only.
- */
-const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids,
- struct pci_dev *dev)
-{
- const struct pci_device_id *ret = pci_match_id(ids, dev);
-
- if (!ret)
- return NULL;
-
- mark_hardware_unmaintained(dev_driver_string(&dev->dev), "%04X:%04X @ %s",
- dev->device, dev->vendor, pci_name(dev));
- return ret;
-}
-EXPORT_SYMBOL(pci_hw_unmaintained);
-
-/**
- * pci_hw_disabled - Tell if a PCI device is disabled
- * @ids: array of PCI device id structures to search in
- * @dev: the PCI device structure to match against
- *
- * Used by a driver to check whether this device is in its list of disabled
- * devices. Returns the matching pci_device_id structure or %NULL if there is
- * no match.
- *
- * Reserved for Internal Red Hat use only.
- */
-const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
- struct pci_dev *dev)
-{
- const struct pci_device_id *ret = pci_match_id(ids, dev);
-
- if (!ret)
- return NULL;
-
- mark_hardware_disabled(dev_driver_string(&dev->dev), "%04X:%04X @ %s",
- dev->device, dev->vendor, pci_name(dev));
- return ret;
-}
-EXPORT_SYMBOL(pci_hw_disabled);
-#endif
-
struct drv_dev_and_id {
struct pci_driver *drv;
struct pci_dev *dev;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index blahblah..blahblah 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1561,21 +1561,6 @@ int pci_add_dynid(struct pci_driver *drv,
const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
struct pci_dev *dev);
-#ifdef CONFIG_RHEL_DIFFERENCES
-const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids,
- struct pci_dev *dev);
-const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids,
- struct pci_dev *dev);
-const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
- struct pci_dev *dev);
-#else
-static inline const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids,
- struct pci_dev *dev) { return NULL; }
-static inline const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids,
- struct pci_dev *dev) { return NULL; }
-static inline const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
- struct pci_dev *dev) {return NULL; }
-#endif
int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
int pass);
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2606
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
