Merge branch 'topic/sa11x0' into for-linus (56e8e1a1) · Commits · 戴 / test

drivers/dma/sa11x0-dma.c

+8 −13

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/platform_device.h>
		#include <linux/sa11x0-dma.h>
		#include <linux/slab.h>
		#include <linux/spinlock.h>

		@@ -830,6 +829,14 @@ static const struct dma_slave_map sa11x0_dma_map[] = {
		{ "sa11x0-ssp", "rx", "Ser4SSPRc" },
		};

		static bool sa11x0_dma_filter_fn(struct dma_chan chan, void param)
		{
		struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
		const char *p = param;

		return !strcmp(c->name, p);
		}

		static int sa11x0_dma_init_dmadev(struct dma_device *dmadev,
		struct device *dev)
		{
		@@ -1087,18 +1094,6 @@ static struct platform_driver sa11x0_dma_driver = {
		.remove = sa11x0_dma_remove,
		};

		bool sa11x0_dma_filter_fn(struct dma_chan chan, void param)
		{
		if (chan->device->dev->driver == &sa11x0_dma_driver.driver) {
		struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
		const char *p = param;

		return !strcmp(c->name, p);
		}
		return false;
		}
		EXPORT_SYMBOL(sa11x0_dma_filter_fn);

		static int __init sa11x0_dma_init(void)
		{
		return platform_driver_register(&sa11x0_dma_driver);

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/*
		* SA11x0 DMA Engine support
		*
		* Copyright (C) 2012 Russell King
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#ifndef __LINUX_SA11X0_DMA_H
		#define __LINUX_SA11X0_DMA_H

		struct dma_chan;

		#if defined(CONFIG_DMA_SA11X0) \|\| defined(CONFIG_DMA_SA11X0_MODULE)
		bool sa11x0_dma_filter_fn(struct dma_chan , void );
		#else
		static inline bool sa11x0_dma_filter_fn(struct dma_chan c, void d)
		{
		return false;
		}
		#endif

		#endif