Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47f29df7 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Linus Torvalds
Browse files

drivers: of: add return value to of_reserved_mem_device_init() 



Driver calling of_reserved_mem_device_init() might be interested if the
initialization has been successful or not, so add support for returning
error code.

This fixes a build warining caused by commit 7bfa5ab6 ("drivers:
dma-coherent: add initialization from device tree"), which has been
merged without this change and without fixing function return value.

Fixes: 7bfa5ab6 ("drivers: dma-coherent: add initialization from device tree")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Laura Abbott <lauraa@codeaurora.org>
Cc: Josh Cartwright <joshc@codeaurora.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ddacbe9

drivers/base/dma-contiguous.c

+2 −1
Original line number Diff line number Diff line
@@ -223,9 +223,10 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, 
#undef pr_fmt

#define pr_fmt(fmt) fmt



static void rmem_cma_device_init(struct reserved_mem *rmem, struct device *dev)

static int rmem_cma_device_init(struct reserved_mem *rmem, struct device *dev)

{

	dev_set_cma_area(dev, rmem->priv);

	return 0;

}



static void rmem_cma_device_release(struct reserved_mem *rmem,

drivers/of/of_reserved_mem.c

+9 −5
Original line number Diff line number Diff line
@@ -243,23 +243,27 @@ static inline struct reserved_mem *__find_rmem(struct device_node *node) 
 * This function assign memory region pointed by "memory-region" device tree

 * property to the given device.

 */

void of_reserved_mem_device_init(struct device *dev)

int of_reserved_mem_device_init(struct device *dev)

{

	struct reserved_mem *rmem;

	struct device_node *np;

	int ret;



	np = of_parse_phandle(dev->of_node, "memory-region", 0);

	if (!np)

		return;

		return -ENODEV;



	rmem = __find_rmem(np);

	of_node_put(np);



	if (!rmem || !rmem->ops || !rmem->ops->device_init)

		return;

		return -EINVAL;



	rmem->ops->device_init(rmem, dev);

	ret = rmem->ops->device_init(rmem, dev);

	if (ret == 0)

		dev_info(dev, "assigned reserved memory node %s\n", rmem->name);



	return ret;

}



/**

include/linux/of_reserved_mem.h

+6 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct reserved_mem { 
};



struct reserved_mem_ops {

	void	(*device_init)(struct reserved_mem *rmem,

	int	(*device_init)(struct reserved_mem *rmem,

			       struct device *dev);

	void	(*device_release)(struct reserved_mem *rmem,

				  struct device *dev);
@@ -28,14 +28,17 @@ typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem); 
	_OF_DECLARE(reservedmem, name, compat, init, reservedmem_of_init_fn)



#ifdef CONFIG_OF_RESERVED_MEM

void of_reserved_mem_device_init(struct device *dev);

int of_reserved_mem_device_init(struct device *dev);

void of_reserved_mem_device_release(struct device *dev);



void fdt_init_reserved_mem(void);

void fdt_reserved_mem_save_node(unsigned long node, const char *uname,

			       phys_addr_t base, phys_addr_t size);

#else

static inline void of_reserved_mem_device_init(struct device *dev) { }

static inline int of_reserved_mem_device_init(struct device *dev)

{

	return -ENOSYS;

}

static inline void of_reserved_mem_device_release(struct device *pdev) { }



static inline void fdt_init_reserved_mem(void) { }