mfd: ab8500-debugfs: Allow number of IRQs to be provided more dynamically
With the introduction of new AB* platforms, it's important to allow as much code reuse as possible. By allowing a system's number of IRQs to be dynamically passed, we can reuse almost all of the -debugfs driver. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
This commit is contained in:
parent
1d843a6c8c
commit
ddba25f17d
|
@ -94,10 +94,11 @@ static u32 debug_address;
|
||||||
|
|
||||||
static int irq_first;
|
static int irq_first;
|
||||||
static int irq_last;
|
static int irq_last;
|
||||||
static u32 irq_count[AB8500_NR_IRQS];
|
static u32 *irq_count;
|
||||||
|
static int num_irqs;
|
||||||
|
|
||||||
static struct device_attribute *dev_attr[AB8500_NR_IRQS];
|
static struct device_attribute **dev_attr;
|
||||||
static char *event_name[AB8500_NR_IRQS];
|
static char **event_name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct ab8500_reg_range
|
* struct ab8500_reg_range
|
||||||
|
@ -483,7 +484,7 @@ static irqreturn_t ab8500_debug_handler(int irq, void *data)
|
||||||
struct kobject *kobj = (struct kobject *)data;
|
struct kobject *kobj = (struct kobject *)data;
|
||||||
unsigned int irq_abb = irq - irq_first;
|
unsigned int irq_abb = irq - irq_first;
|
||||||
|
|
||||||
if (irq_abb < AB8500_NR_IRQS)
|
if (irq_abb < num_irqs)
|
||||||
irq_count[irq_abb]++;
|
irq_count[irq_abb]++;
|
||||||
/*
|
/*
|
||||||
* This makes it possible to use poll for events (POLLPRI | POLLERR)
|
* This makes it possible to use poll for events (POLLPRI | POLLERR)
|
||||||
|
@ -1340,7 +1341,7 @@ static ssize_t show_irq(struct device *dev,
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
irq_index = name - irq_first;
|
irq_index = name - irq_first;
|
||||||
if (irq_index >= AB8500_NR_IRQS)
|
if (irq_index >= num_irqs)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
else
|
else
|
||||||
return sprintf(buf, "%u\n", irq_count[irq_index]);
|
return sprintf(buf, "%u\n", irq_count[irq_index]);
|
||||||
|
@ -1376,7 +1377,7 @@ static ssize_t ab8500_subscribe_write(struct file *file,
|
||||||
}
|
}
|
||||||
|
|
||||||
irq_index = user_val - irq_first;
|
irq_index = user_val - irq_first;
|
||||||
if (irq_index >= AB8500_NR_IRQS)
|
if (irq_index >= num_irqs)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1440,7 +1441,7 @@ static ssize_t ab8500_unsubscribe_write(struct file *file,
|
||||||
}
|
}
|
||||||
|
|
||||||
irq_index = user_val - irq_first;
|
irq_index = user_val - irq_first;
|
||||||
if (irq_index >= AB8500_NR_IRQS)
|
if (irq_index >= num_irqs)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* Set irq count to 0 when unsubscribe */
|
/* Set irq count to 0 when unsubscribe */
|
||||||
|
@ -1521,21 +1522,40 @@ static struct dentry *ab8500_gpadc_dir;
|
||||||
static int ab8500_debug_probe(struct platform_device *plf)
|
static int ab8500_debug_probe(struct platform_device *plf)
|
||||||
{
|
{
|
||||||
struct dentry *file;
|
struct dentry *file;
|
||||||
|
int ret = -ENOMEM;
|
||||||
|
struct ab8500 *ab8500;
|
||||||
debug_bank = AB8500_MISC;
|
debug_bank = AB8500_MISC;
|
||||||
debug_address = AB8500_REV_REG & 0x00FF;
|
debug_address = AB8500_REV_REG & 0x00FF;
|
||||||
|
|
||||||
|
ab8500 = dev_get_drvdata(plf->dev.parent);
|
||||||
|
num_irqs = ab8500->mask_size;
|
||||||
|
|
||||||
|
irq_count = kzalloc(sizeof(irq_count)*num_irqs, GFP_KERNEL);
|
||||||
|
if (!irq_count)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
dev_attr = kzalloc(sizeof(*dev_attr)*num_irqs,GFP_KERNEL);
|
||||||
|
if (!dev_attr)
|
||||||
|
goto out_freeirq_count;
|
||||||
|
|
||||||
|
event_name = kzalloc(sizeof(*event_name)*num_irqs, GFP_KERNEL);
|
||||||
|
if (!event_name)
|
||||||
|
goto out_freedev_attr;
|
||||||
|
|
||||||
irq_first = platform_get_irq_byname(plf, "IRQ_FIRST");
|
irq_first = platform_get_irq_byname(plf, "IRQ_FIRST");
|
||||||
if (irq_first < 0) {
|
if (irq_first < 0) {
|
||||||
dev_err(&plf->dev, "First irq not found, err %d\n",
|
dev_err(&plf->dev, "First irq not found, err %d\n",
|
||||||
irq_first);
|
irq_first);
|
||||||
return irq_first;
|
ret = irq_first;
|
||||||
|
goto out_freeevent_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
irq_last = platform_get_irq_byname(plf, "IRQ_LAST");
|
irq_last = platform_get_irq_byname(plf, "IRQ_LAST");
|
||||||
if (irq_last < 0) {
|
if (irq_last < 0) {
|
||||||
dev_err(&plf->dev, "Last irq not found, err %d\n",
|
dev_err(&plf->dev, "Last irq not found, err %d\n",
|
||||||
irq_last);
|
irq_last);
|
||||||
return irq_last;
|
ret = irq_last;
|
||||||
|
goto out_freeevent_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
ab8500_dir = debugfs_create_dir(AB8500_NAME_STRING, NULL);
|
ab8500_dir = debugfs_create_dir(AB8500_NAME_STRING, NULL);
|
||||||
|
@ -1658,12 +1678,23 @@ err:
|
||||||
if (ab8500_dir)
|
if (ab8500_dir)
|
||||||
debugfs_remove_recursive(ab8500_dir);
|
debugfs_remove_recursive(ab8500_dir);
|
||||||
dev_err(&plf->dev, "failed to create debugfs entries.\n");
|
dev_err(&plf->dev, "failed to create debugfs entries.\n");
|
||||||
return -ENOMEM;
|
out_freeevent_name:
|
||||||
|
kfree(event_name);
|
||||||
|
out_freedev_attr:
|
||||||
|
kfree(dev_attr);
|
||||||
|
out_freeirq_count:
|
||||||
|
kfree(irq_count);
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ab8500_debug_remove(struct platform_device *plf)
|
static int ab8500_debug_remove(struct platform_device *plf)
|
||||||
{
|
{
|
||||||
debugfs_remove_recursive(ab8500_dir);
|
debugfs_remove_recursive(ab8500_dir);
|
||||||
|
kfree(event_name);
|
||||||
|
kfree(dev_attr);
|
||||||
|
kfree(irq_count);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue