Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / i2c / busses / i2c-at91.c

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 75195e3f5ddb5b7090ae1f3923988d40bc1a4f8a..6bb839b688be4f17dd0b435f46bf483e054d2071 100644 (file)
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -603,15 +603,18 @@ static const struct of_device_id atmel_twi_dt_ids[] = {
        }
 };
 MODULE_DEVICE_TABLE(of, atmel_twi_dt_ids);
-#else
-#define atmel_twi_dt_ids NULL
 #endif
 
-static bool filter(struct dma_chan *chan, void *slave)
+static bool filter(struct dma_chan *chan, void *pdata)
 {
-       struct at_dma_slave *sl = slave;
+       struct at91_twi_pdata *sl_pdata = pdata;
+       struct at_dma_slave *sl;
+
+       if (!sl_pdata)
+               return false;
 
-       if (sl->dma_dev == chan->device->dev) {
+       sl = &sl_pdata->dma_slave;
+       if (sl && (sl->dma_dev == chan->device->dev)) {
                chan->private = sl;
                return true;
        } else {
@@ -622,11 +625,10 @@ static bool filter(struct dma_chan *chan, void *slave)
 static int at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr)
 {
        int ret = 0;
-       struct at_dma_slave *sdata;
+       struct at91_twi_pdata *pdata = dev->pdata;
        struct dma_slave_config slave_config;
        struct at91_twi_dma *dma = &dev->dma;
-
-       sdata = &dev->pdata->dma_slave;
+       dma_cap_mask_t mask;
 
        memset(&slave_config, 0, sizeof(slave_config));
        slave_config.src_addr = (dma_addr_t)phy_addr + AT91_TWI_RHR;
@@ -637,25 +639,22 @@ static int at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr)
        slave_config.dst_maxburst = 1;
        slave_config.device_fc = false;
 
-       if (sdata && sdata->dma_dev) {
-               dma_cap_mask_t mask;
+       dma_cap_zero(mask);
+       dma_cap_set(DMA_SLAVE, mask);
 
-               dma_cap_zero(mask);
-               dma_cap_set(DMA_SLAVE, mask);
-               dma->chan_tx = dma_request_channel(mask, filter, sdata);
-               if (!dma->chan_tx) {
-                       dev_err(dev->dev, "no DMA channel available for tx\n");
-                       ret = -EBUSY;
-                       goto error;
-               }
-               dma->chan_rx = dma_request_channel(mask, filter, sdata);
-               if (!dma->chan_rx) {
-                       dev_err(dev->dev, "no DMA channel available for rx\n");
-                       ret = -EBUSY;
-                       goto error;
-               }
-       } else {
-               ret = -EINVAL;
+       dma->chan_tx = dma_request_slave_channel_compat(mask, filter, pdata,
+                                                       dev->dev, "tx");
+       if (!dma->chan_tx) {
+               dev_err(dev->dev, "can't get a DMA channel for tx\n");
+               ret = -EBUSY;
+               goto error;
+       }
+
+       dma->chan_rx = dma_request_slave_channel_compat(mask, filter, pdata,
+                                                       dev->dev, "rx");
+       if (!dma->chan_rx) {
+               dev_err(dev->dev, "can't get a DMA channel for rx\n");
+               ret = -EBUSY;
                goto error;
        }
 
@@ -785,12 +784,11 @@ static int at91_twi_probe(struct platform_device *pdev)
 static int at91_twi_remove(struct platform_device *pdev)
 {
        struct at91_twi_dev *dev = platform_get_drvdata(pdev);
-       int rc;
 
-       rc = i2c_del_adapter(&dev->adapter);
+       i2c_del_adapter(&dev->adapter);
        clk_disable_unprepare(dev->clk);
 
-       return rc;
+       return 0;
 }
 
 #ifdef CONFIG_PM
@@ -828,7 +826,7 @@ static struct platform_driver at91_twi_driver = {
        .driver         = {
                .name   = "at91_i2c",
                .owner  = THIS_MODULE,
-               .of_match_table = atmel_twi_dt_ids,
+               .of_match_table = of_match_ptr(atmel_twi_dt_ids),
                .pm     = at91_twi_pm_ops,
        },
 };