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

Commit 068a565a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'testing/driver-warnings' of... 

Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes

A collection of warning fixes on non-ARM code from Arnd Bergmann:

* 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: s3c: mark s3c2440_clk_add as __init_refok
  spi/s3c64xx: use correct dma_transfer_direction type
  pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
  USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
  mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
  SCSI: ARM: make fas216_dumpinfo function conditional
  SCSI: ARM: ncr5380/oak uses no interrupts
parents b55a7a5f 5276b687

arch/arm/mach-s3c24xx/clock-s3c2440.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = { 
	CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),

};



static int s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)

static int __init_refok s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)

{

	struct clk *clock_upll;

	struct clk *clock_h;

drivers/pcmcia/pxa2xx_sharpsl.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) 
	sharpsl_pcmcia_init_reset(skt);

}



static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {

static struct pcmcia_low_level sharpsl_pcmcia_ops = {

	.owner                  = THIS_MODULE,

	.hw_init                = sharpsl_pcmcia_hw_init,

	.socket_state           = sharpsl_pcmcia_socket_state,

drivers/scsi/arm/fas216.c

+1 −1
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char * 
		SCp->buffers_residual, suffix);

}



#ifdef CHECK_STRUCTURE

static void fas216_dumpinfo(FAS216_Info *info)

{

	static int used = 0;
@@ -223,7 +224,6 @@ static void fas216_dumpinfo(FAS216_Info *info) 
		info->internal_done, info->magic_end);

}



#ifdef CHECK_STRUCTURE

static void __fas216_checkmagic(FAS216_Info *info, const char *func)

{

	int corruption = 0;

drivers/scsi/arm/oak.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
/*#define PSEUDO_DMA*/



#define OAKSCSI_PUBLIC_RELEASE 1

#define DONT_USE_INTR



#define priv(host)			((struct NCR5380_hostdata *)(host)->hostdata)

#define NCR5380_local_declare()		void __iomem *_base

drivers/spi/spi-s3c64xx.c

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 


struct s3c64xx_spi_dma_data {

	unsigned		ch;

	enum dma_data_direction direction;

	enum dma_transfer_direction direction;

	enum dma_ch	dmach;

	struct property		*dma_prop;

};
@@ -1067,11 +1067,11 @@ static int __devinit s3c64xx_spi_get_dmares( 


	if (tx) {

		dma_data = &sdd->tx_dma;

		dma_data->direction = DMA_TO_DEVICE;

		dma_data->direction = DMA_MEM_TO_DEV;

		chan_str = "tx";

	} else {

		dma_data = &sdd->rx_dma;

		dma_data->direction = DMA_FROM_DEVICE;

		dma_data->direction = DMA_DEV_TO_MEM;

		chan_str = "rx";

	}