Merge branch 'quilt/jdelvare-hwmon'

diff --cc drivers/hwmon/ibmaem.c
index 783d0c17b762dc504babef2e5a039c033b3d8f77,c6d59b1788d7d835b901297a93fdf8dcb737504f..6a967d7dbdee845d653ec3cac19d84ba872e4363
--- 1/drivers/hwmon/ibmaem.c
--- 2/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@@ -355,9 -355,41 +354,9 @@@ static void aem_msg_handler(struct ipmi
        complete(&data->read_complete);
  }
  
 -/* ID functions */
 -
 -/* Obtain an id */
 -static int aem_idr_get(int *id)
 -{
 -      int i, err;
 -
 -again:
 -      if (unlikely(!idr_pre_get(&aem_idr, GFP_KERNEL)))
 -              return -ENOMEM;
 -
 -      spin_lock(&aem_idr_lock);
 -      err = idr_get_new(&aem_idr, NULL, &i);
 -      spin_unlock(&aem_idr_lock);
 -
 -      if (unlikely(err == -EAGAIN))
 -              goto again;
 -      else if (unlikely(err))
 -              return err;
 -
 -      *id = i & MAX_ID_MASK;
 -      return 0;
 -}
 -
 -/* Release an object ID */
 -static void aem_idr_put(int id)
 -{
 -      spin_lock(&aem_idr_lock);
 -      idr_remove(&aem_idr, id);
 -      spin_unlock(&aem_idr_lock);
 -}
 -
  /* Sensor support functions */
  
- /* Read a sensor value */
+ /* Read a sensor value; must be called with data->lock held */
  static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
                           void *buf, size_t size)
  {