those tahvo-specific IRQ handling routines
aren't needed anymore. Drop'em.
Signed-off-by: Felipe Balbi <[email protected]>
---
drivers/cbus/tahvo.c | 64 --------------------------------------------------
drivers/cbus/tahvo.h | 5 ----
2 files changed, 0 insertions(+), 69 deletions(-)
diff --git a/drivers/cbus/tahvo.c b/drivers/cbus/tahvo.c
index f01defc..d92a05d 100644
--- a/drivers/cbus/tahvo.c
+++ b/drivers/cbus/tahvo.c
@@ -59,14 +59,6 @@ struct tahvo {
static struct tahvo *the_tahvo;
-struct tahvo_irq_handler_desc {
- int (*func)(unsigned long);
- unsigned long arg;
- char name[8];
-};
-
-static struct tahvo_irq_handler_desc
tahvo_irq_handlers[MAX_TAHVO_IRQ_HANDLERS];
-
int tahvo_get_status(void)
{
return the_tahvo != NULL;
@@ -240,62 +232,6 @@ static irqreturn_t tahvo_irq_handler(int irq, void *_tahvo)
return IRQ_HANDLED;
}
-/*
- * Register the handler for a given TAHVO interrupt source.
- */
-int tahvo_request_irq(int id, void *irq_handler, unsigned long arg, char *name)
-{
- struct tahvo_irq_handler_desc *hnd;
- struct tahvo *tahvo = the_tahvo;
-
- if (irq_handler == NULL || id >= MAX_TAHVO_IRQ_HANDLERS ||
- name == NULL) {
- dev_err(tahvo->dev, "Invalid arguments to %s\n",
- __FUNCTION__);
- return -EINVAL;
- }
- hnd = &tahvo_irq_handlers[id];
- if (hnd->func != NULL) {
- dev_err(tahvo->dev, "IRQ %d already reserved\n", id);
- return -EBUSY;
- }
- dev_dbg(tahvo->dev, "Registering interrupt %d for device %s\n",
- id, name);
- hnd->func = irq_handler;
- hnd->arg = arg;
- strlcpy(hnd->name, name, sizeof(hnd->name));
-
- tahvo_ack_irq(id);
- tahvo_enable_irq(id);
-
- return 0;
-}
-EXPORT_SYMBOL(tahvo_request_irq);
-
-/*
- * Unregister the handler for a given TAHVO interrupt source.
- */
-void tahvo_free_irq(int id)
-{
- struct tahvo_irq_handler_desc *hnd;
- struct tahvo *tahvo = the_tahvo;
-
- if (id >= MAX_TAHVO_IRQ_HANDLERS) {
- dev_err(tahvo->dev, "Invalid argument to %s\n",
- __FUNCTION__);
- return;
- }
- hnd = &tahvo_irq_handlers[id];
- if (hnd->func == NULL) {
- dev_err(tahvo->dev, "IRQ %d already freed\n", id);
- return;
- }
-
- tahvo_disable_irq(id);
- hnd->func = NULL;
-}
-EXPORT_SYMBOL(tahvo_free_irq);
-
/* --------------------------------------------------------------------------
*/
static void tahvo_irq_bus_lock(struct irq_data *data)
diff --git a/drivers/cbus/tahvo.h b/drivers/cbus/tahvo.h
index e5ed990..b2f195f 100644
--- a/drivers/cbus/tahvo.h
+++ b/drivers/cbus/tahvo.h
@@ -54,11 +54,6 @@ int tahvo_get_status(void);
int tahvo_read_reg(unsigned reg);
void tahvo_write_reg(unsigned reg, u16 val);
void tahvo_set_clear_reg_bits(unsigned reg, u16 set, u16 clear);
-int tahvo_request_irq(int id, void *irq_handler, unsigned long arg, char
*name);
-void tahvo_free_irq(int id);
-void tahvo_enable_irq(int id);
-void tahvo_disable_irq(int id);
-void tahvo_ack_irq(int id);
int tahvo_get_backlight_level(void);
int tahvo_get_max_backlight_level(void);
void tahvo_set_backlight_level(int level);
--
1.7.6.396.ge0613
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html