a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: Trivial twl4030 code-style fixes

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Felipe Contreras 2012-02-01 03:02:48 +02:00 committed by Samuel Ortiz
parent 450b115106
commit cbcde05ec2
1 changed files with 14 additions and 12 deletions

26
drivers/mfd/twl4030-irq.c
View File

@ -59,7 +59,6 @@
#define REG_PIH_ISR_P2 0x02 #define REG_PIH_ISR_P2 0x02
#define REG_PIH_SIR 0x03 /* for testing */ #define REG_PIH_SIR 0x03 /* for testing */
/* Linux could (eventually) use either IRQ line */ /* Linux could (eventually) use either IRQ line */
static int irq_line; static int irq_line;
@ -111,7 +110,8 @@ static int nr_sih_modules;
#define TWL4030_MODULE_INT_PWR TWL4030_MODULE_INT #define TWL4030_MODULE_INT_PWR TWL4030_MODULE_INT
/* Order in this table matches order in PIH_ISR. That is, /*
* Order in this table matches order in PIH_ISR. That is,
* BIT(n) in PIH_ISR is sih_modules[n]. * BIT(n) in PIH_ISR is sih_modules[n].
*/ */
/* sih_modules_twl4030 is used both in twl4030 and twl5030 */ /* sih_modules_twl4030 is used both in twl4030 and twl5030 */
@ -309,6 +309,7 @@ static irqreturn_t handle_twl4030_pih(int irq, void *devid)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* /*
@ -337,7 +338,6 @@ static int twl4030_init_sih_modules(unsigned line)
memset(buf, 0xff, sizeof buf); memset(buf, 0xff, sizeof buf);
sih = sih_modules; sih = sih_modules;
for (i = 0; i < nr_sih_modules; i++, sih++) { for (i = 0; i < nr_sih_modules; i++, sih++) {
/* skip USB -- it's funky */ /* skip USB -- it's funky */
if (!sih->bytes_ixr) if (!sih->bytes_ixr)
continue; continue;
@ -352,7 +352,8 @@ static int twl4030_init_sih_modules(unsigned line)
pr_err("twl4030: err %d initializing %s %s\n", pr_err("twl4030: err %d initializing %s %s\n",
status, sih->name, "IMR"); status, sih->name, "IMR");
/* Maybe disable "exclusive" mode; buffer second pending irq; /*
* Maybe disable "exclusive" mode; buffer second pending irq;
* set Clear-On-Read (COR) bit. * set Clear-On-Read (COR) bit.
* *
* NOTE that sometimes COR polarity is documented as being * NOTE that sometimes COR polarity is documented as being
@ -382,7 +383,8 @@ static int twl4030_init_sih_modules(unsigned line)
if (sih->irq_lines <= line) if (sih->irq_lines <= line)
continue; continue;
/* Clear pending interrupt status. Either the read was /*
* Clear pending interrupt status. Either the read was
* enough, or we need to write those bits. Repeat, in * enough, or we need to write those bits. Repeat, in
* case an IRQ is pending (PENDDIS=0) ... that's not * case an IRQ is pending (PENDDIS=0) ... that's not
* uncommon with PWR_INT.PWRON. * uncommon with PWR_INT.PWRON.
@ -398,7 +400,8 @@ static int twl4030_init_sih_modules(unsigned line)
status = twl_i2c_write(sih->module, buf, status = twl_i2c_write(sih->module, buf,
sih->mask[line].isr_offset, sih->mask[line].isr_offset,
sih->bytes_ixr); sih->bytes_ixr);
/* else COR=1 means read sufficed. /*
* else COR=1 means read sufficed.
* (for most SIH modules...) * (for most SIH modules...)
*/ */
} }
@ -410,7 +413,8 @@ static int twl4030_init_sih_modules(unsigned line)
static inline void activate_irq(int irq) static inline void activate_irq(int irq)
{ {
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
/* ARM requires an extra step to clear IRQ_NOREQUEST, which it /*
* ARM requires an extra step to clear IRQ_NOREQUEST, which it
* sets on behalf of every irq_chip. Also sets IRQ_NOPROBE. * sets on behalf of every irq_chip. Also sets IRQ_NOPROBE.
*/ */
set_irq_flags(irq, IRQF_VALID); set_irq_flags(irq, IRQF_VALID);
@ -622,9 +626,7 @@ static irqreturn_t handle_twl4030_sih(int irq, void *data)
static unsigned twl4030_irq_next; static unsigned twl4030_irq_next;
/* returns the first IRQ used by this SIH bank, /* returns the first IRQ used by this SIH bank, or negative errno */
* or negative errno
*/
int twl4030_sih_setup(int module) int twl4030_sih_setup(int module)
{ {
int sih_mod; int sih_mod;
@ -688,7 +690,6 @@ int twl4030_sih_setup(int module)
/* FIXME need a call to reverse twl4030_sih_setup() ... */ /* FIXME need a call to reverse twl4030_sih_setup() ... */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* FIXME pass in which interrupt line we'll use ... */ /* FIXME pass in which interrupt line we'll use ... */
@ -711,7 +712,8 @@ int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
twl4030_irq_base = irq_base; twl4030_irq_base = irq_base;
/* install an irq handler for each of the SIH modules; /*
* install an irq handler for each of the SIH modules;
* clone dummy irq_chip since PIH can't *do* anything * clone dummy irq_chip since PIH can't *do* anything
*/ */
twl4030_irq_chip = dummy_irq_chip; twl4030_irq_chip = dummy_irq_chip;