* Note that all locks are private to this file. Nothing else may
* touch them.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
unsigned long mask;
mask = probe_irq_on();
- if (!mask) {
- probe_irq_off(mask);
+ if (!mask)
return NO_IRQ;
- }
/*
* Enable the ADC interrupt.
mcp_enable(mcp);
id = mcp_reg_read(mcp, UCB_ID);
- if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) {
+ if (id != UCB_ID_1200 && id != UCB_ID_1300) {
printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
goto err_disable;
}
goto err_free;
}
- ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING,
+ ret = request_irq(ucb->irq, ucb1x00_irq, SA_TRIGGER_RISING,
"UCB1x00", ucb);
if (ret) {
printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",