lkml.org 
[lkml]   [2009]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] sony_pi: Remove the BKL from sonypi_misc_open
    From b5fefbe4ab8783a0299953b0869cf2af24160875 Mon Sep 17 00:00:00 2001
    From: John Kacur <jkacur@redhat.com>
    Date: Sun, 18 Oct 2009 23:49:49 +0200
    Subject: [PATCH] sony_pi: Remove the BKL from sonypi_misc_open

    The BKL is in this function because of the BKL pushdown
    (see commit f8f2c79d594463427f7114cedb1555110d547d89)

    It is not needed here because the mutex_lock sonypi_device.lock
    provides the necessary locking.

    Signed-off-by: John Kacur <jkacur@redhat.com>
    ---
    drivers/char/sonypi.c | 4 +---
    1 files changed, 1 insertions(+), 3 deletions(-)

    diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
    index 8c262aa..f64600b 100644
    --- a/drivers/char/sonypi.c
    +++ b/drivers/char/sonypi.c
    @@ -50,7 +50,6 @@
    #include <linux/err.h>
    #include <linux/kfifo.h>
    #include <linux/platform_device.h>
    -#include <linux/smp_lock.h>

    #include <asm/uaccess.h>
    #include <asm/io.h>
    @@ -902,14 +901,13 @@ static int sonypi_misc_release(struct inode *inode, struct file *file)

    static int sonypi_misc_open(struct inode *inode, struct file *file)
    {
    - lock_kernel();
    mutex_lock(&sonypi_device.lock);
    /* Flush input queue on first open */
    if (!sonypi_device.open_count)
    kfifo_reset(sonypi_device.fifo);
    sonypi_device.open_count++;
    mutex_unlock(&sonypi_device.lock);
    - unlock_kernel();
    +
    return 0;
    }

    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-10-18 23:57    [W:0.023 / U:30.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site