git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netns xfrm: fix "ip xfrm state|policy count" misreport
[safe/jmp/linux-2.6]
/
drivers
/
spi
/
atmel_spi.c
diff --git
a/drivers/spi/atmel_spi.c
b/drivers/spi/atmel_spi.c
index
5e39bac
..
d21c24e
100644
(file)
--- a/
drivers/spi/atmel_spi.c
+++ b/
drivers/spi/atmel_spi.c
@@
-189,14
+189,14
@@
static void atmel_spi_next_xfer_data(struct spi_master *master,
/* use scratch buffer only when rx or tx data is unspecified */
if (xfer->rx_buf)
/* use scratch buffer only when rx or tx data is unspecified */
if (xfer->rx_buf)
- *rx_dma = xfer->rx_dma + xfer->len - len;
+ *rx_dma = xfer->rx_dma + xfer->len -
*p
len;
else {
*rx_dma = as->buffer_dma;
if (len > BUFFER_SIZE)
len = BUFFER_SIZE;
}
if (xfer->tx_buf)
else {
*rx_dma = as->buffer_dma;
if (len > BUFFER_SIZE)
len = BUFFER_SIZE;
}
if (xfer->tx_buf)
- *tx_dma = xfer->tx_dma + xfer->len - len;
+ *tx_dma = xfer->tx_dma + xfer->len -
*p
len;
else {
*tx_dma = as->buffer_dma;
if (len > BUFFER_SIZE)
else {
*tx_dma = as->buffer_dma;
if (len > BUFFER_SIZE)
@@
-322,7
+322,7
@@
static void atmel_spi_next_message(struct spi_master *master)
spi = msg->spi;
dev_dbg(master->dev.parent, "start message %p for %s\n",
spi = msg->spi;
dev_dbg(master->dev.parent, "start message %p for %s\n",
- msg,
spi->dev.bus_id
);
+ msg,
dev_name(&spi->dev)
);
/* select chip if it's not still active */
if (as->stay) {
/* select chip if it's not still active */
if (as->stay) {
@@
-530,9
+530,6
@@
atmel_spi_interrupt(int irq, void *dev_id)
return ret;
}
return ret;
}
-/* the spi->mode bits understood by this driver: */
-#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)
-
static int atmel_spi_setup(struct spi_device *spi)
{
struct atmel_spi *as;
static int atmel_spi_setup(struct spi_device *spi)
{
struct atmel_spi *as;
@@
-555,8
+552,6
@@
static int atmel_spi_setup(struct spi_device *spi)
return -EINVAL;
}
return -EINVAL;
}
- if (bits == 0)
- bits = 8;
if (bits < 8 || bits > 16) {
dev_dbg(&spi->dev,
"setup: invalid bits_per_word %u (8 to 16)\n",
if (bits < 8 || bits > 16) {
dev_dbg(&spi->dev,
"setup: invalid bits_per_word %u (8 to 16)\n",
@@
-564,12
+559,6
@@
static int atmel_spi_setup(struct spi_device *spi)
return -EINVAL;
}
return -EINVAL;
}
- if (spi->mode & ~MODEBITS) {
- dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",
- spi->mode & ~MODEBITS);
- return -EINVAL;
- }
-
/* see notes above re chipselect */
if (!atmel_spi_is_v2()
&& spi->chip_select == 0
/* see notes above re chipselect */
if (!atmel_spi_is_v2()
&& spi->chip_select == 0
@@
-627,7
+616,7
@@
static int atmel_spi_setup(struct spi_device *spi)
if (!asd)
return -ENOMEM;
if (!asd)
return -ENOMEM;
- ret = gpio_request(npcs_pin,
spi->dev.bus_id
);
+ ret = gpio_request(npcs_pin,
dev_name(&spi->dev)
);
if (ret) {
kfree(asd);
return ret;
if (ret) {
kfree(asd);
return ret;
@@
-668,10
+657,9
@@
static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
as = spi_master_get_devdata(spi->master);
dev_dbg(controller, "new message %p submitted for %s\n",
as = spi_master_get_devdata(spi->master);
dev_dbg(controller, "new message %p submitted for %s\n",
- msg,
spi->dev.bus_id
);
+ msg,
dev_name(&spi->dev)
);
- if (unlikely(list_empty(&msg->transfers)
- || !spi->max_speed_hz))
+ if (unlikely(list_empty(&msg->transfers)))
return -EINVAL;
if (as->stopping)
return -EINVAL;
if (as->stopping)
@@
-776,6
+764,9
@@
static int __init atmel_spi_probe(struct platform_device *pdev)
if (!master)
goto out_free;
if (!master)
goto out_free;
+ /* the spi->mode bits understood by this driver: */
+ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
+
master->bus_num = pdev->id;
master->num_chipselect = 4;
master->setup = atmel_spi_setup;
master->bus_num = pdev->id;
master->num_chipselect = 4;
master->setup = atmel_spi_setup;
@@
-797,14
+788,14
@@
static int __init atmel_spi_probe(struct platform_device *pdev)
spin_lock_init(&as->lock);
INIT_LIST_HEAD(&as->queue);
as->pdev = pdev;
spin_lock_init(&as->lock);
INIT_LIST_HEAD(&as->queue);
as->pdev = pdev;
- as->regs = ioremap(regs->start,
(regs->end - regs->start) + 1
);
+ as->regs = ioremap(regs->start,
resource_size(regs)
);
if (!as->regs)
goto out_free_buffer;
as->irq = irq;
as->clk = clk;
ret = request_irq(irq, atmel_spi_interrupt, 0,
if (!as->regs)
goto out_free_buffer;
as->irq = irq;
as->clk = clk;
ret = request_irq(irq, atmel_spi_interrupt, 0,
-
pdev->dev.bus_id
, master);
+
dev_name(&pdev->dev)
, master);
if (ret)
goto out_unmap_regs;
if (ret)
goto out_unmap_regs;