diff options
Diffstat (limited to 'drivers/spi/spi-atmel.c')
-rw-r--r-- | drivers/spi/spi-atmel.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 3daf754f96f8..6478a9713038 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c | |||
@@ -170,18 +170,18 @@ | |||
170 | /* Bit manipulation macros */ | 170 | /* Bit manipulation macros */ |
171 | #define SPI_BIT(name) \ | 171 | #define SPI_BIT(name) \ |
172 | (1 << SPI_##name##_OFFSET) | 172 | (1 << SPI_##name##_OFFSET) |
173 | #define SPI_BF(name,value) \ | 173 | #define SPI_BF(name, value) \ |
174 | (((value) & ((1 << SPI_##name##_SIZE) - 1)) << SPI_##name##_OFFSET) | 174 | (((value) & ((1 << SPI_##name##_SIZE) - 1)) << SPI_##name##_OFFSET) |
175 | #define SPI_BFEXT(name,value) \ | 175 | #define SPI_BFEXT(name, value) \ |
176 | (((value) >> SPI_##name##_OFFSET) & ((1 << SPI_##name##_SIZE) - 1)) | 176 | (((value) >> SPI_##name##_OFFSET) & ((1 << SPI_##name##_SIZE) - 1)) |
177 | #define SPI_BFINS(name,value,old) \ | 177 | #define SPI_BFINS(name, value, old) \ |
178 | ( ((old) & ~(((1 << SPI_##name##_SIZE) - 1) << SPI_##name##_OFFSET)) \ | 178 | (((old) & ~(((1 << SPI_##name##_SIZE) - 1) << SPI_##name##_OFFSET)) \ |
179 | | SPI_BF(name,value)) | 179 | | SPI_BF(name, value)) |
180 | 180 | ||
181 | /* Register access macros */ | 181 | /* Register access macros */ |
182 | #define spi_readl(port,reg) \ | 182 | #define spi_readl(port, reg) \ |
183 | __raw_readl((port)->regs + SPI_##reg) | 183 | __raw_readl((port)->regs + SPI_##reg) |
184 | #define spi_writel(port,reg,value) \ | 184 | #define spi_writel(port, reg, value) \ |
185 | __raw_writel((value), (port)->regs + SPI_##reg) | 185 | __raw_writel((value), (port)->regs + SPI_##reg) |
186 | 186 | ||
187 | /* use PIO for small transfers, avoiding DMA setup/teardown overhead and | 187 | /* use PIO for small transfers, avoiding DMA setup/teardown overhead and |
@@ -1516,7 +1516,7 @@ static int atmel_spi_probe(struct platform_device *pdev) | |||
1516 | 1516 | ||
1517 | /* setup spi core then atmel-specific driver state */ | 1517 | /* setup spi core then atmel-specific driver state */ |
1518 | ret = -ENOMEM; | 1518 | ret = -ENOMEM; |
1519 | master = spi_alloc_master(&pdev->dev, sizeof *as); | 1519 | master = spi_alloc_master(&pdev->dev, sizeof(*as)); |
1520 | if (!master) | 1520 | if (!master) |
1521 | goto out_free; | 1521 | goto out_free; |
1522 | 1522 | ||