MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141

pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141 / fdf777a63bcb59e0dfd78bfe2c6242e01f6d4eb9 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040

stable-tracking-hist top was MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040 / 90463bfd2d5a3c8b52f6e6d71024a00e052b0ced ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-mokopatches-tracking-hist-fix-stray-endmenu-patch

mokopatches-tracking-hist top was fix-stray-endmenu-patch / 3630e0be570de8057e7f8d2fe501ed353cdf34e6 ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
fix-stray-endmenu.patch

Signed-off-by: Andy Green <andy@openmoko.com>

1 files changed, 0 insertions, 239 deletions

diff --git a/drivers/mfd/pcf50606-adc.c b/drivers/mfd/pcf50606-adc.c
deleted file mode 100644
index 68e099ad61c..00000000000
--- a/drivers/mfd/pcf50606-adc.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Philips PCF50606 ADC Driver
- *
- * (C) 2006-2008 by Openmoko, Inc.
- * Author: Balaji Rao <balajirrao@openmoko.org>
- * All rights reserved.
- *
- * Broken down from monstrous PCF50606 driver mainly by
- * Harald Welte, Andy Green and Werner Almesberger
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <linux/mfd/pcf50606/core.h>
-#include <linux/mfd/pcf50606/adc.h>
-
-struct pcf50606_adc_request {
-	int mux;
-	int avg;
-	int result;
-	void (*callback)(struct pcf50606 *, void *, int);
-	void *callback_param;
-
-	/* Used in case of sync requests */
-	struct completion completion;
-
-};
-
-static void adc_read_setup(struct pcf50606 *pcf,
-				 int channel, int avg)
-{
-	channel &= PCF50606_ADCC2_ADCMUX_MASK;
-
-	/* start ADC conversion of selected channel */
-	pcf50606_reg_write(pcf, PCF50606_REG_ADCC2, channel |
-		    PCF50606_ADCC2_ADCSTART | PCF50606_ADCC2_RES_10BIT);
-
-}
-
-static void trigger_next_adc_job_if_any(struct pcf50606 *pcf)
-{
-	int head, tail;
-
-	mutex_lock(&pcf->adc.queue_mutex);
-
-	head = pcf->adc.queue_head;
-	tail = pcf->adc.queue_tail;
-
-	if (!pcf->adc.queue[head])
-		goto out;
-
-	adc_read_setup(pcf, pcf->adc.queue[head]->mux,
-				pcf->adc.queue[head]->avg);
-out:
-	mutex_unlock(&pcf->adc.queue_mutex);
-}
-
-static int
-adc_enqueue_request(struct pcf50606 *pcf, struct pcf50606_adc_request *req)
-{
-	int head, tail;
-
-	mutex_lock(&pcf->adc.queue_mutex);
-	head = pcf->adc.queue_head;
-	tail = pcf->adc.queue_tail;
-
-	if (pcf->adc.queue[tail]) {
-		mutex_unlock(&pcf->adc.queue_mutex);
-		return -EBUSY;
-	}
-
-	pcf->adc.queue[tail] = req;
-
-	pcf->adc.queue_tail =
-		(tail + 1) & (PCF50606_MAX_ADC_FIFO_DEPTH - 1);
-
-	mutex_unlock(&pcf->adc.queue_mutex);
-
-	trigger_next_adc_job_if_any(pcf);
-
-	return 0;
-}
-
-static void
-pcf50606_adc_sync_read_callback(struct pcf50606 *pcf, void *param, int result)
-{
-	struct pcf50606_adc_request *req;
-
-	/*We know here that the passed param is an adc_request object */
-	req = (struct pcf50606_adc_request *)param;
-
-	req->result = result;
-	complete(&req->completion);
-}
-
-int pcf50606_adc_sync_read(struct pcf50606 *pcf, int mux, int avg)
-{
-
-	struct pcf50606_adc_request *req;
-	int result;
-
-	/* req is freed when the result is ready, in pcf50606_work*/
-	req = kzalloc(sizeof(*req), GFP_KERNEL);
-	if (!req)
-		return -ENOMEM;
-
-	req->mux = mux;
-	req->avg = avg;
-	req->callback =  pcf50606_adc_sync_read_callback;
-	req->callback_param = req;
-	init_completion(&req->completion);
-
-	adc_enqueue_request(pcf, req);
-
-	wait_for_completion(&req->completion);
-	result = req->result;
-
-	return result;
-}
-EXPORT_SYMBOL_GPL(pcf50606_adc_sync_read);
-
-int pcf50606_adc_async_read(struct pcf50606 *pcf, int mux, int avg,
-			     void (*callback)(struct pcf50606 *, void *, int),
-			     void *callback_param)
-{
-	struct pcf50606_adc_request *req;
-
-	/* req is freed when the result is ready, in pcf50606_work*/
-	req = kmalloc(sizeof(*req), GFP_KERNEL);
-	if (!req)
-		return -ENOMEM;
-
-	req->mux = mux;
-	req->avg = avg;
-	req->callback = callback;
-	req->callback_param = callback_param;
-
-	adc_enqueue_request(pcf, req);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(pcf50606_adc_async_read);
-
-static int adc_result(struct pcf50606 *pcf)
-{
-	u16 ret = (pcf50606_reg_read(pcf, PCF50606_REG_ADCS1) << 2) |
-			(pcf50606_reg_read(pcf, PCF50606_REG_ADCS2) & 0x03);
-
-	dev_info(pcf->dev, "adc result = %d\n", ret);
-
-	return ret;
-}
-
-static void pcf50606_adc_irq(struct pcf50606 *pcf, int irq, void *unused)
-{
-	struct pcf50606_adc_request *req;
-	int head;
-
-	mutex_lock(&pcf->adc.queue_mutex);
-	head = pcf->adc.queue_head;
-
-	req = pcf->adc.queue[head];
-	if (!req) {
-		dev_err(pcf->dev, "ADC queue empty\n");
-		mutex_unlock(&pcf->adc.queue_mutex);
-		return;
-	}
-	pcf->adc.queue[head] = NULL;
-	pcf->adc.queue_head = (head + 1) &
-				      (PCF50606_MAX_ADC_FIFO_DEPTH - 1);
-
-	mutex_unlock(&pcf->adc.queue_mutex);
-	req->callback(pcf, req->callback_param, adc_result(pcf));
-
-	kfree(req);
-
-	trigger_next_adc_job_if_any(pcf);
-}
-
-int __init pcf50606_adc_probe(struct platform_device *pdev)
-{
-	struct pcf50606 *pcf;
-
-	pcf = platform_get_drvdata(pdev);
-
-	/* Set up IRQ handlers */
-	pcf->irq_handler[PCF50606_IRQ_ADCRDY].handler = pcf50606_adc_irq;
-
-	mutex_init(&pcf->adc.queue_mutex);
-	return 0;
-}
-
-static int __devexit pcf50606_adc_remove(struct platform_device *pdev)
-{
-	struct pcf50606 *pcf;
-
-	pcf = platform_get_drvdata(pdev);
-	pcf->irq_handler[PCF50606_IRQ_ADCRDY].handler = NULL;
-
-	return 0;
-}
-
-struct platform_driver pcf50606_adc_driver = {
-	.driver = {
-		.name = "pcf50606-adc",
-	},
-	.probe = pcf50606_adc_probe,
-	.remove = __devexit_p(pcf50606_adc_remove),
-};
-
-static int __init pcf50606_adc_init(void)
-{
-		return platform_driver_register(&pcf50606_adc_driver);
-}
-module_init(pcf50606_adc_init);
-
-static void __exit pcf50606_adc_exit(void)
-{
-		platform_driver_unregister(&pcf50606_adc_driver);
-}
-module_exit(pcf50606_adc_exit);
-
-MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>");
-MODULE_DESCRIPTION("PCF50606 adc driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:pcf50606-adc");
-