lkml.org 
[lkml]   [2010]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/8] hwmon: applesmc: Relax the severity of device init failure
    Date
    The device init is used to reset the accelerometer. Failure to reset
    is not severe enough to stop loading the module or to resume from
    hibernation. This patch relaxes failure to a warning and drops
    output in case of success.

    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    ---
    drivers/hwmon/applesmc.c | 24 ++----------------------
    1 files changed, 2 insertions(+), 22 deletions(-)

    diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
    index d7a5b75..375e464 100644
    --- a/drivers/hwmon/applesmc.c
    +++ b/drivers/hwmon/applesmc.c
    @@ -458,21 +458,8 @@ static int applesmc_device_init(void)
    mutex_lock(&applesmc_lock);

    for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) {
    - if (debug)
    - printk(KERN_DEBUG "applesmc try %d\n", total);
    if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) &&
    (buffer[0] != 0x00 || buffer[1] != 0x00)) {
    - if (total == INIT_TIMEOUT_MSECS) {
    - printk(KERN_DEBUG "applesmc: device has"
    - " already been initialized"
    - " (0x%02x, 0x%02x).\n",
    - buffer[0], buffer[1]);
    - } else {
    - printk(KERN_DEBUG "applesmc: device"
    - " successfully initialized"
    - " (0x%02x, 0x%02x).\n",
    - buffer[0], buffer[1]);
    - }
    ret = 0;
    goto out;
    }
    @@ -512,13 +499,8 @@ static int applesmc_get_fan_count(void)
    /* Device model stuff */
    static int applesmc_probe(struct platform_device *dev)
    {
    - int ret;
    + applesmc_device_init();

    - ret = applesmc_device_init();
    - if (ret)
    - return ret;
    -
    - pr_info("device successfully initialized\n");
    return 0;
    }

    @@ -535,9 +517,7 @@ static int applesmc_pm_resume(struct device *dev)
    /* Reinitialize device on resume from hibernation */
    static int applesmc_pm_restore(struct device *dev)
    {
    - int ret = applesmc_device_init();
    - if (ret)
    - return ret;
    + applesmc_device_init();
    return applesmc_pm_resume(dev);
    }

    --
    1.7.1


    \
     
     \ /
      Last update: 2010-10-31 08:55    [W:0.021 / U:1.960 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site