Page MenuHomeFreeBSD

D34775.diff
No OneTemporary

D34775.diff

diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -325,6 +325,7 @@
struct pci_devres *lkpi_pci_devres_get_alloc(struct pci_dev *pdev);
void lkpi_pci_devres_release(struct device *, void *);
struct resource *_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size);
+struct pcim_iomap_devres *lkpi_pcim_iomap_devres_find(struct pci_dev *pdev);
void lkpi_pcim_iomap_table_release(struct device *, void *);
static inline int
@@ -1409,26 +1410,6 @@
return (error);
}
-static inline struct pcim_iomap_devres *
-lkpi_pcim_iomap_devres_find(struct pci_dev *pdev)
-{
- struct pcim_iomap_devres *dr;
-
- dr = lkpi_devres_find(&pdev->dev, lkpi_pcim_iomap_table_release,
- NULL, NULL);
- if (dr == NULL) {
- dr = lkpi_devres_alloc(lkpi_pcim_iomap_table_release,
- sizeof(*dr), GFP_KERNEL | __GFP_ZERO);
- if (dr != NULL)
- lkpi_devres_add(&pdev->dev, dr);
- }
-
- if (dr == NULL)
- device_printf(pdev->dev.bsddev, "%s: NULL\n", __func__);
-
- return (dr);
-}
-
static inline void __iomem **
pcim_iomap_table(struct pci_dev *pdev)
{
diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
--- a/sys/compat/linuxkpi/common/src/linux_pci.c
+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
@@ -553,6 +553,26 @@
}
}
+struct pcim_iomap_devres *
+lkpi_pcim_iomap_devres_find(struct pci_dev *pdev)
+{
+ struct pcim_iomap_devres *dr;
+
+ dr = lkpi_devres_find(&pdev->dev, lkpi_pcim_iomap_table_release,
+ NULL, NULL);
+ if (dr == NULL) {
+ dr = lkpi_devres_alloc(lkpi_pcim_iomap_table_release,
+ sizeof(*dr), GFP_KERNEL | __GFP_ZERO);
+ if (dr != NULL)
+ lkpi_devres_add(&pdev->dev, dr);
+ }
+
+ if (dr == NULL)
+ device_printf(pdev->dev.bsddev, "%s: NULL\n", __func__);
+
+ return (dr);
+}
+
void
lkpi_pcim_iomap_table_release(struct device *dev, void *p)
{

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 20, 3:05 PM (2 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36947039
Default Alt Text
D34775.diff (1 KB)

Event Timeline