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

Commit e9d5a461 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] drivers/spi/: fix section mismatches 



  WARNING: drivers/built-in.o - Section mismatch: reference to .init.text:spi_register_master from .text between 'spi_bitbang_start' (at offset 0x84e11a) and 'bitbang_work'
  WARNING: drivers/built-in.o - Section mismatch: reference to .init.text:spi_alloc_master from .text between 'butterfly_attach' (at offset 0x84e681) and 'at25_remove'
  WARNING: drivers/built-in.o - Section mismatch: reference to .init.text:spi_new_device from .text between 'butterfly_attach' (at offset 0x84e7e4) and 'at25_remove'

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 78d832f6

drivers/spi/spi.c

+4 −6
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ static DECLARE_MUTEX(board_lock); 
 * this is exported so that for example a USB or parport based adapter

 * driver could add devices (which it would learn about out-of-band).

 */

struct spi_device *__init_or_module

spi_new_device(struct spi_master *master, struct spi_board_info *chip)

struct spi_device *spi_new_device(struct spi_master *master,

				  struct spi_board_info *chip)

{

	struct spi_device	*proxy;

	struct device		*dev = master->cdev.dev;
@@ -352,8 +352,7 @@ static struct class spi_master_class = { 
 * the master's methods before calling spi_register_master(); and (after errors

 * adding the device) calling spi_master_put() to prevent a memory leak.

 */

struct spi_master * __init_or_module

spi_alloc_master(struct device *dev, unsigned size)

struct spi_master *spi_alloc_master(struct device *dev, unsigned size)

{

	struct spi_master	*master;
@@ -392,8 +391,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master); 
 * After a successful return, the caller is responsible for calling

 * spi_unregister_master().

 */

int __init_or_module

spi_register_master(struct spi_master *master)

int spi_register_master(struct spi_master *master)

{

	static atomic_t		dyn_bus_id = ATOMIC_INIT((1<<16) - 1);

	struct device		*dev = master->cdev.dev;