public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mfd: twl6030-irq: Create struct twl6030_irq

Browse source 
Create "struct twl6030_irq" and place all local variables inside it.
Also allocate twl6030_irq structure dynamically during initialization.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Grygorii Strashko 2013-07-25 16:15:50 +03:00 • committed by Samuel Ortiz
parent b32408f644
commit 0aa8c68531
1 changed files with 58 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
drivers/mfd/twl6030-irq.c
View file

@ -86,36 +86,44 @@ static int twl6030_interrupt_mapping[24] = {
}; };
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
static int twl_irq; struct twl6030_irq {
static bool twl_irq_wake_enabled; unsigned int irq_base;
int twl_irq;
bool irq_wake_enabled;
atomic_t wakeirqs;
struct notifier_block pm_nb;
struct irq_chip irq_chip;
struct irq_domain *irq_domain;
};
static atomic_t twl6030_wakeirqs = ATOMIC_INIT(0); static struct twl6030_irq *twl6030_irq;
struct irq_domain *irq_domain;
static int twl6030_irq_pm_notifier(struct notifier_block *notifier, static int twl6030_irq_pm_notifier(struct notifier_block *notifier,
unsigned long pm_event, void *unused) unsigned long pm_event, void *unused)
{ {
int chained_wakeups; int chained_wakeups;
struct twl6030_irq *pdata = container_of(notifier, struct twl6030_irq,
pm_nb);
switch (pm_event) { switch (pm_event) {
case PM_SUSPEND_PREPARE: case PM_SUSPEND_PREPARE:
chained_wakeups = atomic_read(&twl6030_wakeirqs); chained_wakeups = atomic_read(&pdata->wakeirqs);
if (chained_wakeups && !twl_irq_wake_enabled) { if (chained_wakeups && !pdata->irq_wake_enabled) {
if (enable_irq_wake(twl_irq)) if (enable_irq_wake(pdata->twl_irq))
pr_err("twl6030 IRQ wake enable failed\n"); pr_err("twl6030 IRQ wake enable failed\n");
else else
twl_irq_wake_enabled = true; pdata->irq_wake_enabled = true;
} else if (!chained_wakeups && twl_irq_wake_enabled) { } else if (!chained_wakeups && pdata->irq_wake_enabled) {
disable_irq_wake(twl_irq); disable_irq_wake(pdata->twl_irq);
twl_irq_wake_enabled = false; pdata->irq_wake_enabled = false;
} }
disable_irq(twl_irq); disable_irq(pdata->twl_irq);
break; break;
case PM_POST_SUSPEND: case PM_POST_SUSPEND:
enable_irq(twl_irq); enable_irq(pdata->twl_irq);
break; break;
default: default:
@ -125,10 +133,6 @@ static int twl6030_irq_pm_notifier(struct notifier_block *notifier,
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static struct notifier_block twl6030_irq_pm_notifier_block = {
.notifier_call = twl6030_irq_pm_notifier,
};
/* /*
* Threaded irq handler for the twl6030 interrupt. * Threaded irq handler for the twl6030 interrupt.
* We query the interrupt controller in the twl6030 to determine * We query the interrupt controller in the twl6030 to determine
@ -138,11 +142,11 @@ static struct notifier_block twl6030_irq_pm_notifier_block = {
static irqreturn_t twl6030_irq_thread(int irq, void *data) static irqreturn_t twl6030_irq_thread(int irq, void *data)
{ {
int i, ret; int i, ret;
struct irq_domain *irq_domain = (struct irq_domain *)data;
union { union {
u8 bytes[4]; u8 bytes[4];
u32 int_sts; u32 int_sts;
} sts; } sts;
struct twl6030_irq *pdata = data;
/* read INT_STS_A, B and C in one shot using a burst read */ /* read INT_STS_A, B and C in one shot using a burst read */
ret = twl_i2c_read(TWL_MODULE_PIH, sts.bytes, REG_INT_STS_A, 3); ret = twl_i2c_read(TWL_MODULE_PIH, sts.bytes, REG_INT_STS_A, 3);
@ -163,7 +167,7 @@ static irqreturn_t twl6030_irq_thread(int irq, void *data)
for (i = 0; sts.int_sts; sts.int_sts >>= 1, i++) for (i = 0; sts.int_sts; sts.int_sts >>= 1, i++)
if (sts.int_sts & 0x1) { if (sts.int_sts & 0x1) {
int module_irq = int module_irq =
irq_find_mapping(irq_domain, irq_find_mapping(pdata->irq_domain,
twl6030_interrupt_mapping[i]); twl6030_interrupt_mapping[i]);
if (module_irq) if (module_irq)
handle_nested_irq(module_irq); handle_nested_irq(module_irq);
@ -194,10 +198,12 @@ static irqreturn_t twl6030_irq_thread(int irq, void *data)
static int twl6030_irq_set_wake(struct irq_data *d, unsigned int on) static int twl6030_irq_set_wake(struct irq_data *d, unsigned int on)
{ {
struct twl6030_irq *pdata = irq_get_chip_data(d->irq);
if (on) if (on)
atomic_inc(&twl6030_wakeirqs); atomic_inc(&pdata->wakeirqs);
else else
atomic_dec(&twl6030_wakeirqs); atomic_dec(&pdata->wakeirqs);
return 0; return 0;
} }
@ -272,7 +278,8 @@ int twl6030_mmc_card_detect_config(void)
return ret; return ret;
} }
return irq_find_mapping(irq_domain, MMCDETECT_INTR_OFFSET); return irq_find_mapping(twl6030_irq->irq_domain,
MMCDETECT_INTR_OFFSET);
} }
EXPORT_SYMBOL(twl6030_mmc_card_detect_config); EXPORT_SYMBOL(twl6030_mmc_card_detect_config);
@ -301,15 +308,15 @@ int twl6030_mmc_card_detect(struct device *dev, int slot)
} }
EXPORT_SYMBOL(twl6030_mmc_card_detect); EXPORT_SYMBOL(twl6030_mmc_card_detect);
static struct irq_chip twl6030_irq_chip;
static int twl6030_irq_map(struct irq_domain *d, unsigned int virq, static int twl6030_irq_map(struct irq_domain *d, unsigned int virq,
irq_hw_number_t hwirq) irq_hw_number_t hwirq)
{ {
irq_set_chip_data(virq, &twl6030_irq_chip); struct twl6030_irq *pdata = d->host_data;
irq_set_chip_and_handler(virq, &twl6030_irq_chip, handle_simple_irq);
irq_set_chip_data(virq, pdata);
irq_set_chip_and_handler(virq, &pdata->irq_chip, handle_simple_irq);
irq_set_nested_thread(virq, true); irq_set_nested_thread(virq, true);
irq_set_parent(virq, twl_irq); irq_set_parent(virq, pdata->twl_irq);
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
/* /*
@ -349,6 +356,12 @@ int twl6030_init_irq(struct device *dev, int irq_num)
nr_irqs = TWL6030_NR_IRQS; nr_irqs = TWL6030_NR_IRQS;
twl6030_irq = devm_kzalloc(dev, sizeof(*twl6030_irq), GFP_KERNEL);
if (!twl6030_irq) {
dev_err(dev, "twl6030_irq: Memory allocation failed\n");
return -ENOMEM;
}
mask[0] = 0xFF; mask[0] = 0xFF;
mask[1] = 0xFF; mask[1] = 0xFF;
mask[2] = 0xFF; mask[2] = 0xFF;
@ -369,14 +382,18 @@ int twl6030_init_irq(struct device *dev, int irq_num)
* install an irq handler for each of the modules; * install an irq handler for each of the modules;
* clone dummy irq_chip since PIH can't *do* anything * clone dummy irq_chip since PIH can't *do* anything
*/ */
twl6030_irq_chip = dummy_irq_chip; twl6030_irq->irq_chip = dummy_irq_chip;
twl6030_irq_chip.name = "twl6030"; twl6030_irq->irq_chip.name = "twl6030";
twl6030_irq_chip.irq_set_type = NULL; twl6030_irq->irq_chip.irq_set_type = NULL;
twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake; twl6030_irq->irq_chip.irq_set_wake = twl6030_irq_set_wake;
irq_domain = irq_domain_add_linear(node, nr_irqs, twl6030_irq->pm_nb.notifier_call = twl6030_irq_pm_notifier;
&twl6030_irq_domain_ops, NULL); atomic_set(&twl6030_irq->wakeirqs, 0);
if (!irq_domain) {
twl6030_irq->irq_domain =
irq_domain_add_linear(node, nr_irqs,
&twl6030_irq_domain_ops, twl6030_irq);
if (!twl6030_irq->irq_domain) {
dev_err(dev, "Can't add irq_domain\n"); dev_err(dev, "Can't add irq_domain\n");
return -ENOMEM; return -ENOMEM;
} }
@ -385,26 +402,26 @@ int twl6030_init_irq(struct device *dev, int irq_num)
/* install an irq handler to demultiplex the TWL6030 interrupt */ /* install an irq handler to demultiplex the TWL6030 interrupt */
status = request_threaded_irq(irq_num, NULL, twl6030_irq_thread, status = request_threaded_irq(irq_num, NULL, twl6030_irq_thread,
IRQF_ONESHOT, "TWL6030-PIH", irq_domain); IRQF_ONESHOT, "TWL6030-PIH", twl6030_irq);
if (status < 0) { if (status < 0) {
dev_err(dev, "could not claim irq %d: %d\n", irq_num, status); dev_err(dev, "could not claim irq %d: %d\n", irq_num, status);
goto fail_irq; goto fail_irq;
} }
twl_irq = irq_num; twl6030_irq->twl_irq = irq_num;
register_pm_notifier(&twl6030_irq_pm_notifier_block); register_pm_notifier(&twl6030_irq->pm_nb);
return 0; return 0;
fail_irq: fail_irq:
irq_domain_remove(irq_domain); irq_domain_remove(twl6030_irq->irq_domain);
return status; return status;
} }
int twl6030_exit_irq(void) int twl6030_exit_irq(void)
{ {
if (twl_irq) { if (twl6030_irq && twl6030_irq->twl_irq) {
unregister_pm_notifier(&twl6030_irq_pm_notifier_block); unregister_pm_notifier(&twl6030_irq->pm_nb);
free_irq(twl_irq, NULL); free_irq(twl6030_irq->twl_irq, NULL);
/* /*
* TODO: IRQ domain and allocated nested IRQ descriptors * TODO: IRQ domain and allocated nested IRQ descriptors
* should be freed somehow here. Now It can't be done, because * should be freed somehow here. Now It can't be done, because