Now that we have fetch_inc() we can stop using inc_return() - 1. These are very similar to the existing OP-RETURN primitives we already have, except they return the value of the atomic variable _before_ modification.
Cc: Jiri Kosina <[email protected]> Signed-off-by: Davidlohr Bueso <[email protected]> --- drivers/hid/wacom_sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 499cc8213cfe..88bde7687edd 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1088,7 +1088,7 @@ static int wacom_initialize_battery(struct wacom *wacom) if (wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY) { struct power_supply_desc *bat_desc = &wacom->battery_desc; struct power_supply_desc *ac_desc = &wacom->ac_desc; - n = atomic_inc_return(&battery_no) - 1; + n = atomic_fetch_inc(&battery_no); bat_desc->properties = wacom_battery_props; bat_desc->num_properties = ARRAY_SIZE(wacom_battery_props); -- 2.6.6
