lkml.org 
[lkml]   [2016]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 5/5] [media] winbond-cir: Move a variable assignment in two functions
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 14 Oct 2016 13:13:11 +0200

    Move the assignment for the local variable "data" behind the source code
    for condition checks by these functions.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/media/rc/winbond-cir.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
    index 3d286b9..716b1fe 100644
    --- a/drivers/media/rc/winbond-cir.c
    +++ b/drivers/media/rc/winbond-cir.c
    @@ -566,7 +566,7 @@ wbcir_set_carrier_report(struct rc_dev *dev, int enable)
    static int
    wbcir_txcarrier(struct rc_dev *dev, u32 carrier)
    {
    - struct wbcir_data *data = dev->priv;
    + struct wbcir_data *data;
    unsigned long flags;
    u8 val;
    u32 freq;
    @@ -592,6 +592,7 @@ wbcir_txcarrier(struct rc_dev *dev, u32 carrier)
    break;
    }

    + data = dev->priv;
    spin_lock_irqsave(&data->spinlock, flags);
    if (data->txstate != WBCIR_TXSTATE_INACTIVE) {
    spin_unlock_irqrestore(&data->spinlock, flags);
    @@ -611,7 +612,7 @@ wbcir_txcarrier(struct rc_dev *dev, u32 carrier)
    static int
    wbcir_txmask(struct rc_dev *dev, u32 mask)
    {
    - struct wbcir_data *data = dev->priv;
    + struct wbcir_data *data;
    unsigned long flags;
    u8 val;

    @@ -637,6 +638,7 @@ wbcir_txmask(struct rc_dev *dev, u32 mask)
    return -EINVAL;
    }

    + data = dev->priv;
    spin_lock_irqsave(&data->spinlock, flags);
    if (data->txstate != WBCIR_TXSTATE_INACTIVE) {
    spin_unlock_irqrestore(&data->spinlock, flags);
    --
    2.10.1
    \
     
     \ /
      Last update: 2016-10-14 13:46    [W:3.734 / U:2.700 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site