Merge branch 'for-next/sandbox-of'

3 files changed, 4 insertions, 10 deletions

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 81b35031a1..3363b56675 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -350,12 +350,6 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num)
 }
 EXPORT_SYMBOL(dev_request_mem_region);
 
-int dev_protect(struct device_d *dev, size_t count, unsigned long offset, int prot)
-{
-	printf("%s: currently broken\n", __func__);
-	return -EINVAL;
-}
-
 int generic_memmap_ro(struct cdev *cdev, void **map, int flags)
 {
 	if (!cdev->dev)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index af10fd1da3..d45d3941b8 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -184,7 +184,7 @@ void of_alias_scan(void)
 			end--;
 		len = end - start;
 
-		id = simple_strtol(end, 0, 10);
+		id = simple_strtol(end, NULL, 10);
 		if (id < 0)
 			continue;
 
@@ -280,7 +280,7 @@ struct device_node *of_find_node_by_phandle_from(phandle phandle,
 		root = root_node;
 
 	if (!root)
-		return 0;
+		return NULL;
 
 	of_tree_for_each_node_from(node, root)
 		if (node->phandle == phandle)
diff --git a/drivers/of/of_path.c b/drivers/of/of_path.c
index f0fd917ada..df63c5782a 100644
--- a/drivers/of/of_path.c
+++ b/drivers/of/of_path.c
@@ -132,9 +132,9 @@ int of_find_path(struct device_node *node, const char *propname, char **outpath)
 	struct of_path op = {};
 	struct device_node *rnode;
 	const char *path, *str;
-	int i, len, ret;
+	int i, ret;
 
-	path = of_get_property(node, propname, &len);
+	path = of_get_property(node, propname, NULL);
 	if (!path)
 		return -EINVAL;