mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branch 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: drivers/isdn/act2000: kill irq2card_map drivers/net/eepro: kill dead code Various drivers' irq handlers: kill dead code, needless casts drivers/net: eliminate irq handler impossible checks, needless casts arch/i386/kernel/time: don't shadow 'irq' function arg
This commit is contained in:
commit
5a43c09d1b
74 changed files with 106 additions and 329 deletions
|
|
@ -107,7 +107,7 @@ static int __init snd_gusmax_detect(struct snd_gus_card * gus)
|
|||
|
||||
static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id;
|
||||
struct snd_gusmax *maxcard = dev_id;
|
||||
int loop, max = 5;
|
||||
int handled = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ static int __devinit snd_interwave_detect(struct snd_interwave *iwcard,
|
|||
|
||||
static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct snd_interwave *iwcard = (struct snd_interwave *) dev_id;
|
||||
struct snd_interwave *iwcard = dev_id;
|
||||
int loop, max = 5;
|
||||
int handled = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -1102,7 +1102,7 @@ static void es1371_handle_midi(struct es1371_state *s)
|
|||
|
||||
static irqreturn_t es1371_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct es1371_state *s = (struct es1371_state *)dev_id;
|
||||
struct es1371_state *s = dev_id;
|
||||
unsigned int intsrc, sctl;
|
||||
|
||||
/* fastpath out, to ease interrupt sharing */
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@ static void hal2_adc_interrupt(struct hal2_codec *adc)
|
|||
|
||||
static irqreturn_t hal2_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct hal2_card *hal2 = (struct hal2_card*)dev_id;
|
||||
struct hal2_card *hal2 = dev_id;
|
||||
irqreturn_t ret = IRQ_NONE;
|
||||
|
||||
/* decide what caused this interrupt */
|
||||
|
|
|
|||
|
|
@ -1525,7 +1525,7 @@ static void i810_channel_interrupt(struct i810_card *card)
|
|||
|
||||
static irqreturn_t i810_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct i810_card *card = (struct i810_card *)dev_id;
|
||||
struct i810_card *card = dev_id;
|
||||
u32 status;
|
||||
|
||||
spin_lock(&card->lock);
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ static void mpu401_input_loop(struct mpu_config *devc)
|
|||
static irqreturn_t mpuintr(int irq, void *dev_id)
|
||||
{
|
||||
struct mpu_config *devc;
|
||||
int dev = (int) dev_id;
|
||||
int dev = (int)(unsigned long) dev_id;
|
||||
int handled = 0;
|
||||
|
||||
devc = &dev_conf[dev];
|
||||
|
|
|
|||
|
|
@ -2235,7 +2235,7 @@ static void vwsnd_audio_write_intr(vwsnd_dev_t *devc, unsigned int status)
|
|||
|
||||
static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id)
|
||||
{
|
||||
vwsnd_dev_t *devc = (vwsnd_dev_t *) dev_id;
|
||||
vwsnd_dev_t *devc = dev_id;
|
||||
unsigned int status;
|
||||
|
||||
DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id);
|
||||
|
|
|
|||
|
|
@ -1124,9 +1124,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)
|
|||
u32 doorbellValue;
|
||||
struct snd_korg1212 *korg1212 = dev_id;
|
||||
|
||||
if(irq != korg1212->irq)
|
||||
return IRQ_NONE;
|
||||
|
||||
doorbellValue = readl(korg1212->inDoorbellPtr);
|
||||
|
||||
if (!doorbellValue)
|
||||
|
|
@ -1140,7 +1137,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)
|
|||
|
||||
korg1212->inIRQ++;
|
||||
|
||||
|
||||
switch (doorbellValue) {
|
||||
case K1212_DB_DSPDownloadDone:
|
||||
K1212_DEBUG_PRINTK("K1212_DEBUG: IRQ DNLD count - %ld, %x, [%s].\n",
|
||||
|
|
|
|||
Loading…
Reference in a new issue