lkml.org 
[lkml]   [2015]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFT v2 04/48] powerpc, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
    Date
    Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we
    already have a pointer to corresponding irq_desc.

    Note: this patch has been queued for 4.2 by Michael Ellerman <mpe@ellerman.id.au>

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    ---
    arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +-
    arch/powerpc/platforms/cell/axon_msi.c | 2 +-
    arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +-
    arch/powerpc/sysdev/uic.c | 2 +-
    arch/powerpc/sysdev/xics/xics-common.c | 2 +-
    5 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
    index c949ca055712..63016621aff8 100644
    --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
    +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
    @@ -193,7 +193,7 @@ static struct irq_chip mpc52xx_gpt_irq_chip = {

    void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc)
    {
    - struct mpc52xx_gpt_priv *gpt = irq_get_handler_data(virq);
    + struct mpc52xx_gpt_priv *gpt = irq_desc_get_handler_data(desc);
    int sub_virq;
    u32 status;

    diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
    index 623bd961465a..817d0e6747ea 100644
    --- a/arch/powerpc/platforms/cell/axon_msi.c
    +++ b/arch/powerpc/platforms/cell/axon_msi.c
    @@ -95,7 +95,7 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
    static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
    {
    struct irq_chip *chip = irq_desc_get_chip(desc);
    - struct axon_msic *msic = irq_get_handler_data(irq);
    + struct axon_msic *msic = irq_desc_get_handler_data(desc);
    u32 write_offset, msi;
    int idx;
    int retry = 0;
    diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
    index c269caee58f9..9dd154d6f89a 100644
    --- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
    +++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
    @@ -124,7 +124,7 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
    struct irq_desc *desc)
    {
    struct irq_chip *chip = irq_desc_get_chip(desc);
    - struct irq_domain *irq_domain = irq_get_handler_data(cascade_virq);
    + struct irq_domain *irq_domain = irq_desc_get_handler_data(desc);
    unsigned int virq;

    raw_spin_lock(&desc->lock);
    diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
    index 7c37157d4c24..e763fe215cf5 100644
    --- a/arch/powerpc/sysdev/uic.c
    +++ b/arch/powerpc/sysdev/uic.c
    @@ -198,7 +198,7 @@ void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)
    {
    struct irq_chip *chip = irq_desc_get_chip(desc);
    struct irq_data *idata = irq_desc_get_irq_data(desc);
    - struct uic *uic = irq_get_handler_data(virq);
    + struct uic *uic = irq_desc_get_handler_data(desc);
    u32 msr;
    int src;
    int subvirq;
    diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
    index 878a54036a25..76be7b00dd80 100644
    --- a/arch/powerpc/sysdev/xics/xics-common.c
    +++ b/arch/powerpc/sysdev/xics/xics-common.c
    @@ -227,7 +227,7 @@ void xics_migrate_irqs_away(void)

    /* Locate interrupt server */
    server = -1;
    - ics = irq_get_chip_data(virq);
    + ics = irq_desc_get_chip_data(desc);
    if (ics)
    server = ics->get_server(ics, irq);
    if (server < 0) {
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2015-06-04 07:01    [W:4.106 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site