diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
commit | 63557eb99211a4d1e5f722255a2f9fd0a1e7c6ae (patch) | |
tree | 1c23d2aca9a2fa5374c82b8cd6119c498c6983f8 /drivers | |
parent | eae7bc9688f80eb105d159d544391dbd16be27fe (diff) | |
parent | 4902e6c5e3be35f5653b304f4b578026473c91a3 (diff) | |
download | barebox-63557eb99211a4d1e5f722255a2f9fd0a1e7c6ae.tar.gz barebox-63557eb99211a4d1e5f722255a2f9fd0a1e7c6ae.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/driver.c | 6 | ||||
-rw-r--r-- | drivers/pci/pcie-designware.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 1fd6bbc014..eec2a2d8a2 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -439,12 +439,6 @@ int generic_memmap_ro(struct cdev *cdev, void **map, int flags) return generic_memmap_rw(cdev, map, flags); } -int dummy_probe(struct device_d *dev) -{ - return 0; -} -EXPORT_SYMBOL(dummy_probe); - /** * dev_set_name - set a device name * @dev: device diff --git a/drivers/pci/pcie-designware.c b/drivers/pci/pcie-designware.c index aaea316e90..c6d19559f4 100644 --- a/drivers/pci/pcie-designware.c +++ b/drivers/pci/pcie-designware.c @@ -195,7 +195,7 @@ int dw_pcie_wait_for_link(struct dw_pcie *pci) /* Check if the link is up or not */ for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) { if (dw_pcie_link_up(pci)) { - dev_info(pci->dev, "Link up\n"); + dev_dbg(pci->dev, "Link up\n"); return 0; } udelay(LINK_WAIT_USLEEP_MAX); diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 96e91fc2ce..2793ee93d9 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -10,7 +10,7 @@ menuconfig WATCHDOG if WATCHDOG -menuconfig WATCHDOG_POLLER +config WATCHDOG_POLLER bool "Watchdog periodic feeder support" select POLLER help |