lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 09 Aug 2011 13:07:09 +1000 From: Ryan Mallon <rmallon@...il.com> To: H Hartley Sweeten <hartleys@...ionengravers.com> CC: Linux Kernel <linux-kernel@...r.kernel.org>, "grant.likely@...retlab.ca" <grant.likely@...retlab.ca> Subject: Re: gpio: ep93xx: remove unused inline function On 09/08/11 10:22, H Hartley Sweeten wrote: > On Monday, August 08, 2011 4:54 PM, Ryan Mallon wrote: >> Note that we have a lot of line>> 3 and (1<< (line& 7)) scattered >> through this file. We could do something like this (completely untested): >> >> ---- >> gpio-ep93xx: Add helper functions for irq_port and irq_port_mask >> >> Signed-off-by: Ryan Mallon<rmallon@...il.com> >> --- >> >> diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c >> index 72fb9c6..3092155 100644 >> --- a/drivers/gpio/gpio-ep93xx.c >> +++ b/drivers/gpio/gpio-ep93xx.c >> @@ -45,6 +45,16 @@ static const u8 eoi_register_offset[3] = { 0x98, 0xb4, 0x54 }; >> static const u8 int_en_register_offset[3] = { 0x9c, 0xb8, 0x58 }; >> static const u8 int_debounce_register_offset[3] = { 0xa8, 0xc4, 0x64 }; >> >> +static inline int irq_port_mask(unsigned int irq) >> +{ >> + return 1<< (irq_to_gpio(irq)& 7); >> +} >> + >> +static inline int irq_port(unsigned int irq) >> +{ >> + return irq_to_gpio(irq)>> 3; >> +} >> + > Ryan, > > If you _do_ want to consolidate the port/mask stuff how about something like > this instead? This at least gets the irq_to_gpio() call in one place. > Either approach should be fine. Since the helper functions are inline the compiler should be smart enough to realise that it only needs to call irq_to_gpio once. You don't really need to rename port_mask to mask either, it just makes the patch more verbose than it needs to be. If you want to put this through can you please add: Signed-off-by: Ryan Mallon <rmallon@...il.com> Thanks, ~Ryan > Regards, > Hartley > > --- > > gpio: ep93xx: Add helper function to convert irq to gpio, port, and mask. > > Signed-off-by: H Hartley Sweeten<hsweeten@...ionengravers.com> > > --- > > diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c > index 468b27d..59074f6 100644 > --- a/drivers/gpio/gpio-ep93xx.c > +++ b/drivers/gpio/gpio-ep93xx.c > @@ -46,6 +46,17 @@ static const u8 eoi_register_offset[3] = { 0x98, 0xb4, 0x54 }; > static const u8 int_en_register_offset[3] = { 0x9c, 0xb8, 0x58 }; > static const u8 int_debounce_register_offset[3] = { 0xa8, 0xc4, 0x64 }; > > +static int ep93xx_gpio_irq_to_gpio_port_mask(unsigned int irq, > + int *port, int *mask) > +{ > + int gpio = irq_to_gpio(irq); > + > + *port = gpio>> 3; > + *mask = 1<< (gpio& 7); > + > + return gpio; > +} > + > static void ep93xx_gpio_update_int_params(unsigned port) > { > BUG_ON(port> 2); > @@ -69,14 +80,14 @@ static inline void ep93xx_gpio_int_mask(unsigned line) > > static void ep93xx_gpio_int_debounce(unsigned int irq, bool enable) > { > - int line = irq_to_gpio(irq); > - int port = line>> 3; > - int port_mask = 1<< (line& 7); > + int port, mask; > + > + ep93xx_gpio_irq_to_gpio_port_mask(irq,&port,&mask); > > if (enable) > - gpio_int_debounce[port] |= port_mask; > + gpio_int_debounce[port] |= mask; > else > - gpio_int_debounce[port]&= ~port_mask; > + gpio_int_debounce[port]&= ~mask; > > __raw_writeb(gpio_int_debounce[port], > EP93XX_GPIO_REG(int_debounce_register_offset[port])); > @@ -119,48 +130,50 @@ static void ep93xx_gpio_f_irq_handler(unsigned int irq, struct irq_desc *desc) > > static void ep93xx_gpio_irq_ack(struct irq_data *d) > { > - int line = irq_to_gpio(d->irq); > - int port = line>> 3; > - int port_mask = 1<< (line& 7); > + int port, mask; > + > + ep93xx_gpio_irq_to_gpio_port_mask(d->irq,&port,&mask); > > if (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) { > - gpio_int_type2[port] ^= port_mask; /* switch edge direction */ > + gpio_int_type2[port] ^= mask; /* switch edge direction */ > ep93xx_gpio_update_int_params(port); > } > > - __raw_writeb(port_mask, EP93XX_GPIO_REG(eoi_register_offset[port])); > + __raw_writeb(mask, EP93XX_GPIO_REG(eoi_register_offset[port])); > } > > static void ep93xx_gpio_irq_mask_ack(struct irq_data *d) > { > - int line = irq_to_gpio(d->irq); > - int port = line>> 3; > - int port_mask = 1<< (line& 7); > + int port, mask; > + > + ep93xx_gpio_irq_to_gpio_port_mask(d->irq,&port,&mask); > > if (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) > - gpio_int_type2[port] ^= port_mask; /* switch edge direction */ > + gpio_int_type2[port] ^= mask; /* switch edge direction */ > > - gpio_int_unmasked[port]&= ~port_mask; > + gpio_int_unmasked[port]&= ~mask; > ep93xx_gpio_update_int_params(port); > > - __raw_writeb(port_mask, EP93XX_GPIO_REG(eoi_register_offset[port])); > + __raw_writeb(mask, EP93XX_GPIO_REG(eoi_register_offset[port])); > } > > static void ep93xx_gpio_irq_mask(struct irq_data *d) > { > - int line = irq_to_gpio(d->irq); > - int port = line>> 3; > + int port, mask; > + > + ep93xx_gpio_irq_to_gpio_port_mask(d->irq,&port,&mask); > > - gpio_int_unmasked[port]&= ~(1<< (line& 7)); > + gpio_int_unmasked[port]&= ~mask; > ep93xx_gpio_update_int_params(port); > } > > static void ep93xx_gpio_irq_unmask(struct irq_data *d) > { > - int line = irq_to_gpio(d->irq); > - int port = line>> 3; > + int port, mask; > > - gpio_int_unmasked[port] |= 1<< (line& 7); > + ep93xx_gpio_irq_to_gpio_port_mask(d->irq,&port,&mask); > + > + gpio_int_unmasked[port] |= mask; > ep93xx_gpio_update_int_params(port); > } > > @@ -171,41 +184,41 @@ static void ep93xx_gpio_irq_unmask(struct irq_data *d) > */ > static int ep93xx_gpio_irq_type(struct irq_data *d, unsigned int type) > { > - const int gpio = irq_to_gpio(d->irq); > - const int port = gpio>> 3; > - const int port_mask = 1<< (gpio& 7); > + int gpio, port, mask; > irq_flow_handler_t handler; > > + gpio = ep93xx_gpio_irq_to_gpio_port_mask(d->irq,&port,&mask); > + > gpio_direction_input(gpio); > > switch (type) { > case IRQ_TYPE_EDGE_RISING: > - gpio_int_type1[port] |= port_mask; > - gpio_int_type2[port] |= port_mask; > + gpio_int_type1[port] |= mask; > + gpio_int_type2[port] |= mask; > handler = handle_edge_irq; > break; > case IRQ_TYPE_EDGE_FALLING: > - gpio_int_type1[port] |= port_mask; > - gpio_int_type2[port]&= ~port_mask; > + gpio_int_type1[port] |= mask; > + gpio_int_type2[port]&= ~mask; > handler = handle_edge_irq; > break; > case IRQ_TYPE_LEVEL_HIGH: > - gpio_int_type1[port]&= ~port_mask; > - gpio_int_type2[port] |= port_mask; > + gpio_int_type1[port]&= ~mask; > + gpio_int_type2[port] |= mask; > handler = handle_level_irq; > break; > case IRQ_TYPE_LEVEL_LOW: > - gpio_int_type1[port]&= ~port_mask; > - gpio_int_type2[port]&= ~port_mask; > + gpio_int_type1[port]&= ~mask; > + gpio_int_type2[port]&= ~mask; > handler = handle_level_irq; > break; > case IRQ_TYPE_EDGE_BOTH: > - gpio_int_type1[port] |= port_mask; > + gpio_int_type1[port] |= mask; > /* set initial polarity based on current input level */ > if (gpio_get_value(gpio)) > - gpio_int_type2[port]&= ~port_mask; /* falling */ > + gpio_int_type2[port]&= ~mask; /* falling */ > else > - gpio_int_type2[port] |= port_mask; /* rising */ > + gpio_int_type2[port] |= mask; /* rising */ > handler = handle_edge_irq; > break; > default: > @@ -215,7 +228,7 @@ static int ep93xx_gpio_irq_type(struct irq_data *d, unsigned int type) > > __irq_set_handler_locked(d->irq, handler); > > - gpio_int_enabled[port] |= port_mask; > + gpio_int_enabled[port] |= mask; > > ep93xx_gpio_update_int_params(port); > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists