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

Commit bb2d1c36 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

[PATCH] SPI controller build/warning fixes 



The signature of the per-device cleanup() routine changed to remove its
const-ness.  Three new SPI controller drivers now need that change, to
eliminate build warnings.

This also fixes a build bug with atmel_spi on AT91 systems.

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 0bb92e6c

drivers/spi/atmel_spi.c

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
#include <asm/arch/board.h>

#include <asm/arch/gpio.h>



#ifdef CONFIG_ARCH_AT91

#include <asm/arch/cpu.h>

#endif



#include "atmel_spi.h"



/*
@@ -491,7 +495,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) 
	return 0;

}



static void atmel_spi_cleanup(const struct spi_device *spi)

static void atmel_spi_cleanup(struct spi_device *spi)

{

	if (spi->controller_state)

		gpio_free((unsigned int)spi->controller_data);

drivers/spi/omap_uwire.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int uwire_setup(struct spi_device *spi) 
	return uwire_setup_transfer(spi, NULL);

}



static void uwire_cleanup(const struct spi_device *spi)

static void uwire_cleanup(struct spi_device *spi)

{

	kfree(spi->controller_state);

}

drivers/spi/spi_imx.c

+2 −3
Original line number Diff line number Diff line
@@ -1361,10 +1361,9 @@ err_first_setup: 
	return status;

}



static void cleanup(const struct spi_device *spi)

static void cleanup(struct spi_device *spi)

{

	struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi);

	kfree(chip);

	kfree(spi_get_ctldata(spi));

}



static int init_queue(struct driver_data *drv_data)