Merge branch 'from-linus' into upstream

[powerpc.git] / drivers / dma / dmaengine.c

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 473c47b..1527804 100644 (file)
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -79,7 +79,7 @@ static ssize_t show_memcpy_count(struct class_device *cd, char *buf)
        unsigned long count = 0;
        int i;
 
-       for_each_cpu(i)
+       for_each_possible_cpu(i)
                count += per_cpu_ptr(chan->local, i)->memcpy_count;
 
        return sprintf(buf, "%lu\n", count);
@@ -91,7 +91,7 @@ static ssize_t show_bytes_transferred(struct class_device *cd, char *buf)
        unsigned long count = 0;
        int i;
 
-       for_each_cpu(i)
+       for_each_possible_cpu(i)
                count += per_cpu_ptr(chan->local, i)->bytes_transferred;
 
        return sprintf(buf, "%lu\n", count);
@@ -166,8 +166,8 @@ static struct dma_chan *dma_client_chan_alloc(struct dma_client *client)
 }
 
 /**
- * dma_client_chan_free - release a DMA channel
- * @chan: &dma_chan
+ * dma_chan_cleanup - release a DMA channel's resources
+ * @kref: kernel reference structure that contains the DMA channel device
  */
 void dma_chan_cleanup(struct kref *kref)
 {
@@ -182,7 +182,7 @@ static void dma_chan_free_rcu(struct rcu_head *rcu)
        struct dma_chan *chan = container_of(rcu, struct dma_chan, rcu);
        int bias = 0x7FFFFFFF;
        int i;
-       for_each_cpu(i)
+       for_each_possible_cpu(i)
                bias -= local_read(&per_cpu_ptr(chan->local, i)->refcount);
        atomic_sub(bias, &chan->refcount.refcount);
        kref_put(&chan->refcount, dma_chan_cleanup);
@@ -199,7 +199,7 @@ static void dma_client_chan_free(struct dma_chan *chan)
  * dma_chans_rebalance - reallocate channels to clients
  *
  * When the number of DMA channel in the system changes,
- * channels need to be rebalanced among clients
+ * channels need to be rebalanced among clients.
  */
 static void dma_chans_rebalance(void)
 {
@@ -264,7 +264,7 @@ struct dma_client *dma_async_client_register(dma_event_callback event_callback)
 
 /**
  * dma_async_client_unregister - unregister a client and free the &dma_client
- * @client:
+ * @client: &dma_client to free
  *
  * Force frees any allocated DMA channels, frees the &dma_client memory
  */
@@ -306,7 +306,7 @@ void dma_async_client_chan_request(struct dma_client *client,
 }
 
 /**
- * dma_async_device_register -
+ * dma_async_device_register - registers DMA devices found
  * @device: &dma_device
  */
 int dma_async_device_register(struct dma_device *device)
@@ -348,8 +348,8 @@ int dma_async_device_register(struct dma_device *device)
 }
 
 /**
- * dma_async_device_unregister -
- * @device: &dma_device
+ * dma_async_device_cleanup - function called when all references are released
+ * @kref: kernel reference object
  */
 static void dma_async_device_cleanup(struct kref *kref)
 {
@@ -359,7 +359,11 @@ static void dma_async_device_cleanup(struct kref *kref)
        complete(&device->done);
 }
 
-void dma_async_device_unregister(struct dma_device* device)
+/**
+ * dma_async_device_unregister - unregisters DMA devices
+ * @device: &dma_device
+ */
+void dma_async_device_unregister(struct dma_device *device)
 {
        struct dma_chan *chan;
        unsigned long flags;