projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'perf-urgent-for-mingo-20160809' of git://git.kernel.org/pub/scm/linux...
[deliverable/linux.git]
/
drivers
/
pci
/
host
/
pci-thunder-pem.c
diff --git
a/drivers/pci/host/pci-thunder-pem.c
b/drivers/pci/host/pci-thunder-pem.c
index 9b8ab94f3c8c88dc2fac62f504e2ce1d0b04f8c6..6abaf80ffb395d48668dc995782cdb4b53ff4067 100644
(file)
--- a/
drivers/pci/host/pci-thunder-pem.c
+++ b/
drivers/pci/host/pci-thunder-pem.c
@@
-15,13
+15,12
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
-#include <linux/
module
.h>
+#include <linux/
init
.h>
#include <linux/of_address.h>
#include <linux/of_pci.h>
#include <linux/of_address.h>
#include <linux/of_pci.h>
+#include <linux/pci-ecam.h>
#include <linux/platform_device.h>
#include <linux/platform_device.h>
-#include "../ecam.h"
-
#define PEM_CFG_WR 0x28
#define PEM_CFG_RD 0x30
#define PEM_CFG_WR 0x28
#define PEM_CFG_RD 0x30
@@
-285,8
+284,9
@@
static int thunder_pem_config_write(struct pci_bus *bus, unsigned int devfn,
return pci_generic_config_write(bus, devfn, where, size, val);
}
return pci_generic_config_write(bus, devfn, where, size, val);
}
-static int thunder_pem_init(struct
device *dev, struct
pci_config_window *cfg)
+static int thunder_pem_init(struct pci_config_window *cfg)
{
{
+ struct device *dev = cfg->parent;
resource_size_t bar4_start;
struct resource *res_pem;
struct thunder_pem_pci *pem_pci;
resource_size_t bar4_start;
struct resource *res_pem;
struct thunder_pem_pci *pem_pci;
@@
-346,7
+346,6
@@
static const struct of_device_id thunder_pem_of_match[] = {
{ .compatible = "cavium,pci-host-thunder-pem" },
{ },
};
{ .compatible = "cavium,pci-host-thunder-pem" },
{ },
};
-MODULE_DEVICE_TABLE(of, thunder_pem_of_match);
static int thunder_pem_probe(struct platform_device *pdev)
{
static int thunder_pem_probe(struct platform_device *pdev)
{
@@
-360,7
+359,4
@@
static struct platform_driver thunder_pem_driver = {
},
.probe = thunder_pem_probe,
};
},
.probe = thunder_pem_probe,
};
-module_platform_driver(thunder_pem_driver);
-
-MODULE_DESCRIPTION("Thunder PEM PCIe host driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(thunder_pem_driver);
This page took
0.025561 seconds
and
5
git commands to generate.