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

Commit 2b9b84f4 authored by Mika Westerberg's avatar Mika Westerberg Committed by Mark Brown
Browse files

spi/pxa2xx: fix warnings when compiling a 64-bit kernel 



Fix following warnings seen when compiling 64-bit:

drivers/spi/spi-pxa2xx.c: In function ‘map_dma_buffers’: drivers/spi/spi-pxa2xx.c:384:7: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/spi/spi-pxa2xx.c:384:40: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/spi/spi-pxa2xx.c: In function ‘pxa2xx_spi_probe’:
drivers/spi/spi-pxa2xx.c:1572:34: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/spi/spi-pxa2xx.c:1572:34: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/spi/spi-pxa2xx.c:1572:34: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/spi/spi-pxa2xx.c:1572:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2b49ebda

drivers/spi/spi-pxa2xx.c

+2 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ MODULE_ALIAS("platform:pxa2xx-spi"); 


#define DMA_INT_MASK		(DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)

#define RESET_DMA_CHANNEL	(DCSR_NODESC | DMA_INT_MASK)

#define IS_DMA_ALIGNED(x)	((((u32)(x)) & 0x07) == 0)

#define IS_DMA_ALIGNED(x)	IS_ALIGNED((unsigned long)(x), DMA_ALIGNMENT)

#define MAX_DMA_LEN		8191

#define DMA_ALIGNMENT		8
@@ -1576,8 +1576,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 
	master->transfer = transfer;



	drv_data->ssp_type = ssp->type;

	drv_data->null_dma_buf = (u32 *)ALIGN((u32)(drv_data +

						sizeof(struct driver_data)), 8);

	drv_data->null_dma_buf = (u32 *)PTR_ALIGN(&drv_data[1], DMA_ALIGNMENT);



	drv_data->ioaddr = ssp->mmio_base;

	drv_data->ssdr_physical = ssp->phys_base + SSDR;