Use our own wacom_devm_sysfs_create_group() as there is currently no generic one. It has been requested at least twice [1][2] but has been always rejected. However, in the Wacom case, for the wirelessly connected devices, we need to be able to release the created sysfs files without removing the parent kobject.
[1] https://patchwork.kernel.org/patch/7526551/ [2] https://lkml.org/lkml/2013/3/14/728 Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com> Acked-by: Ping Cheng <pi...@wacom.com> Signed-off-by: Jiri Kosina <jkos...@suse.cz> [aaron.sko...@wacom.com: Imported into input-wacom repository (2df68a8)] Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com> [aaron.sko...@wacom.com: Backported from input-wacom repository (4b97397)] Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com> --- 2.6.30/wacom.h | 1 - 2.6.30/wacom_sys.c | 94 ++++++++++++++++++++++++++------------------------- 2.6.36/wacom.h | 1 - 2.6.36/wacom_sys.c | 94 ++++++++++++++++++++++++++------------------------- 2.6.38/wacom.h | 1 - 2.6.38/wacom_sys.c | 98 ++++++++++++++++++++++++++--------------------------- 3.17/wacom.h | 1 - 3.17/wacom_sys.c | 95 +++++++++++++++++++++++++-------------------------- 3.7/wacom.h | 1 - 3.7/wacom_sys.c | 99 ++++++++++++++++++++++++++---------------------------- 10 files changed, 236 insertions(+), 249 deletions(-) diff --git a/2.6.30/wacom.h b/2.6.30/wacom.h index c87cc16..65ead0b 100755 --- a/2.6.30/wacom.h +++ b/2.6.30/wacom.h @@ -122,7 +122,6 @@ struct wacom { u8 llv; /* status led brightness no button */ u8 hlv; /* status led brightness button pressed */ } led; - bool led_initialized; }; extern const struct usb_device_id wacom_ids[]; diff --git a/2.6.30/wacom_sys.c b/2.6.30/wacom_sys.c index 3d34efe..4283976 100644 --- a/2.6.30/wacom_sys.c +++ b/2.6.30/wacom_sys.c @@ -652,6 +652,45 @@ static struct attribute_group intuos5_led_attr_group = { .attrs = intuos5_led_attrs, }; +struct wacom_sysfs_group_devres { + struct attribute_group *group; + struct kobject *root; +}; + +static void wacom_devm_sysfs_group_release(struct device *dev, void *res) +{ + struct wacom_sysfs_group_devres *devres = res; + struct kobject *kobj = devres->root; + + dev_dbg(dev, "%s: dropping reference to %s\n", + __func__, devres->group->name); + sysfs_remove_group(kobj, devres->group); +} + +static int wacom_devm_sysfs_create_group(struct wacom *wacom, + struct attribute_group *group) +{ + struct wacom_sysfs_group_devres *devres; + int error; + + devres = devres_alloc(wacom_devm_sysfs_group_release, + sizeof(struct wacom_sysfs_group_devres), + GFP_KERNEL); + if (!devres) + return -ENOMEM; + + devres->group = group; + devres->root = &wacom->intf->dev.kobj; + + error = sysfs_create_group(devres->root, group); + if (error) + return error; + + devres_add(&wacom->intf->dev, devres); + + return 0; +} + static int wacom_initialize_leds(struct wacom *wacom) { int error; @@ -668,8 +707,9 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.select[1] = 0; wacom->led.llv = 10; wacom->led.hlv = 20; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); + + error = wacom_devm_sysfs_create_group(wacom, + &intuos4_led_attr_group); break; case WACOM_24HD: @@ -678,8 +718,9 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.select[1] = 0; wacom->led.llv = 0; wacom->led.hlv = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); + + error = wacom_devm_sysfs_create_group(wacom, + &cintiq_led_attr_group); break; case INTUOS5S: @@ -693,8 +734,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.llv = 32; wacom->led.hlv = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &intuos5_led_attr_group); break; default: @@ -707,47 +748,10 @@ static int wacom_initialize_leds(struct wacom *wacom) return error; } wacom_led_control(wacom); - wacom->led_initialized = true; return 0; } -static void wacom_destroy_leds(struct wacom *wacom) -{ - if (!wacom->led_initialized) - return; - - wacom->led_initialized = false; - - if (wacom->wacom_wac.features.device_type != BTN_TOOL_PEN) - return; - - switch (wacom->wacom_wac.features.type) { - case INTUOS4S: - case INTUOS4: - case INTUOS4L: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); - break; - - case WACOM_24HD: - case WACOM_21UX2: - sysfs_remove_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); - break; - - case INTUOS5S: - case INTUOS5: - case INTUOS5L: - case INTUOSPS: - case INTUOSPM: - case INTUOSPL: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); - break; - } -} - static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id) { struct usb_device *dev = interface_to_usbdev(intf); @@ -852,7 +856,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i error = input_register_device(input_dev); if (error) - goto fail5; + goto fail4; /* Note that if query fails it is not a hard failure */ wacom_query_tablet_data(intf, features); @@ -860,7 +864,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i usb_set_intfdata(intf, wacom); return 0; - fail5: wacom_destroy_leds(wacom); fail4: wacom_remove_shared_data(wacom_wac); fail3: usb_free_urb(wacom->irq); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) @@ -881,7 +884,6 @@ static void wacom_disconnect(struct usb_interface *intf) usb_kill_urb(wacom->irq); input_unregister_device(wacom->wacom_wac.input); - wacom_destroy_leds(wacom); usb_free_urb(wacom->irq); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, diff --git a/2.6.36/wacom.h b/2.6.36/wacom.h index e4ae477..01a9350 100644 --- a/2.6.36/wacom.h +++ b/2.6.36/wacom.h @@ -129,7 +129,6 @@ struct wacom { u8 hlv; /* status led brightness button pressed */ u8 img_lum; /* OLED matrix display brightness */ } led; - bool led_initialized; }; extern const struct usb_device_id wacom_ids[]; diff --git a/2.6.36/wacom_sys.c b/2.6.36/wacom_sys.c index b8294dd..b641c9f 100644 --- a/2.6.36/wacom_sys.c +++ b/2.6.36/wacom_sys.c @@ -738,6 +738,45 @@ static struct attribute_group intuos5_led_attr_group = { .attrs = intuos5_led_attrs, }; +struct wacom_sysfs_group_devres { + struct attribute_group *group; + struct kobject *root; +}; + +static void wacom_devm_sysfs_group_release(struct device *dev, void *res) +{ + struct wacom_sysfs_group_devres *devres = res; + struct kobject *kobj = devres->root; + + dev_dbg(dev, "%s: dropping reference to %s\n", + __func__, devres->group->name); + sysfs_remove_group(kobj, devres->group); +} + +static int wacom_devm_sysfs_create_group(struct wacom *wacom, + struct attribute_group *group) +{ + struct wacom_sysfs_group_devres *devres; + int error; + + devres = devres_alloc(wacom_devm_sysfs_group_release, + sizeof(struct wacom_sysfs_group_devres), + GFP_KERNEL); + if (!devres) + return -ENOMEM; + + devres->group = group; + devres->root = &wacom->intf->dev.kobj; + + error = sysfs_create_group(devres->root, group); + if (error) + return error; + + devres_add(&wacom->intf->dev, devres); + + return 0; +} + static int wacom_initialize_leds(struct wacom *wacom) { int error; @@ -755,8 +794,9 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.llv = 10; wacom->led.hlv = 20; wacom->led.img_lum = 10; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); + + error = wacom_devm_sysfs_create_group(wacom, + &intuos4_led_attr_group); break; case WACOM_24HD: @@ -766,8 +806,9 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.llv = 0; wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); + + error = wacom_devm_sysfs_create_group(wacom, + &cintiq_led_attr_group); break; case INTUOS5S: @@ -782,8 +823,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &intuos5_led_attr_group); break; default: @@ -796,47 +837,10 @@ static int wacom_initialize_leds(struct wacom *wacom) return error; } wacom_led_control(wacom); - wacom->led_initialized = true; return 0; } -static void wacom_destroy_leds(struct wacom *wacom) -{ - if (!wacom->led_initialized) - return; - - wacom->led_initialized = false; - - if (wacom->wacom_wac.features.device_type != BTN_TOOL_PEN) - return; - - switch (wacom->wacom_wac.features.type) { - case INTUOS4S: - case INTUOS4: - case INTUOS4L: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); - break; - - case WACOM_24HD: - case WACOM_21UX2: - sysfs_remove_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); - break; - - case INTUOS5S: - case INTUOS5: - case INTUOS5L: - case INTUOSPS: - case INTUOSPM: - case INTUOSPL: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); - break; - } -} - static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id) { struct usb_device *dev = interface_to_usbdev(intf); @@ -944,7 +948,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i error = input_register_device(input_dev); if (error) - goto fail5; + goto fail4; /* Note that if query fails it is not a hard failure */ wacom_query_tablet_data(intf, features); @@ -952,7 +956,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i usb_set_intfdata(intf, wacom); return 0; - fail5: wacom_destroy_leds(wacom); fail4: wacom_remove_shared_data(wacom_wac); fail3: usb_free_urb(wacom->irq); fail2: usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); @@ -969,7 +972,6 @@ static void wacom_disconnect(struct usb_interface *intf) usb_kill_urb(wacom->irq); input_unregister_device(wacom->wacom_wac.input); - wacom_destroy_leds(wacom); usb_free_urb(wacom->irq); usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, wacom->wacom_wac.data, wacom->data_dma); diff --git a/2.6.38/wacom.h b/2.6.38/wacom.h index d21d786..c8941c9 100644 --- a/2.6.38/wacom.h +++ b/2.6.38/wacom.h @@ -134,7 +134,6 @@ struct wacom { u8 hlv; /* status led brightness button pressed (1..127) */ u8 img_lum; /* OLED matrix display brightness */ } led; - bool led_initialized; struct power_supply battery; struct kobject *remote_dir; struct attribute_group remote_group[5]; diff --git a/2.6.38/wacom_sys.c b/2.6.38/wacom_sys.c index 1f2a850..a41104e 100644 --- a/2.6.38/wacom_sys.c +++ b/2.6.38/wacom_sys.c @@ -1035,6 +1035,45 @@ static struct attribute_group intuos5_led_attr_group = { .attrs = intuos5_led_attrs, }; +struct wacom_sysfs_group_devres { + struct attribute_group *group; + struct kobject *root; +}; + +static void wacom_devm_sysfs_group_release(struct device *dev, void *res) +{ + struct wacom_sysfs_group_devres *devres = res; + struct kobject *kobj = devres->root; + + dev_dbg(dev, "%s: dropping reference to %s\n", + __func__, devres->group->name); + sysfs_remove_group(kobj, devres->group); +} + +static int wacom_devm_sysfs_create_group(struct wacom *wacom, + struct attribute_group *group) +{ + struct wacom_sysfs_group_devres *devres; + int error; + + devres = devres_alloc(wacom_devm_sysfs_group_release, + sizeof(struct wacom_sysfs_group_devres), + GFP_KERNEL); + if (!devres) + return -ENOMEM; + + devres->group = group; + devres->root = &wacom->intf->dev.kobj; + + error = sysfs_create_group(devres->root, group); + if (error) + return error; + + devres_add(&wacom->intf->dev, devres); + + return 0; +} + static int wacom_initialize_leds(struct wacom *wacom) { int error; @@ -1052,8 +1091,9 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.llv = 10; wacom->led.hlv = 20; wacom->led.img_lum = 10; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); + + error = wacom_devm_sysfs_create_group(wacom, + &intuos4_led_attr_group); break; case WACOM_24HD: @@ -1064,8 +1104,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &cintiq_led_attr_group); break; case INTUOS5S: @@ -1080,8 +1120,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &intuos5_led_attr_group); break; default: @@ -1094,47 +1134,10 @@ static int wacom_initialize_leds(struct wacom *wacom) return error; } wacom_led_control(wacom); - wacom->led_initialized = true; return 0; } -static void wacom_destroy_leds(struct wacom *wacom) -{ - if (!wacom->led_initialized) - return; - - wacom->led_initialized = false; - - if (wacom->wacom_wac.features.device_type != BTN_TOOL_PEN) - return; - - switch (wacom->wacom_wac.features.type) { - case INTUOS4S: - case INTUOS4: - case INTUOS4L: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); - break; - - case WACOM_24HD: - case WACOM_21UX2: - sysfs_remove_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); - break; - - case INTUOS5S: - case INTUOS5: - case INTUOS5L: - case INTUOSPS: - case INTUOSPM: - case INTUOSPL: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); - break; - } -} - static enum power_supply_property wacom_battery_props[] = { POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_STATUS, @@ -1509,13 +1512,11 @@ static void wacom_wireless_work(struct work_struct *work) /* Stylus interface */ wacom1 = usb_get_intfdata(usbdev->config->interface[1]); wacom_wac1 = &(wacom1->wacom_wac); - wacom_destroy_leds(wacom1); wacom_unregister_inputs(wacom1); /* Touch interface */ wacom2 = usb_get_intfdata(usbdev->config->interface[2]); wacom_wac2 = &(wacom2->wacom_wac); - wacom_destroy_leds(wacom2); wacom_unregister_inputs(wacom2); if (wacom_wac->pid == 0) { @@ -1594,9 +1595,7 @@ static void wacom_wireless_work(struct work_struct *work) return; fail: - wacom_destroy_leds(wacom1); wacom_unregister_inputs(wacom1); - wacom_destroy_leds(wacom2); wacom_unregister_inputs(wacom2); return; } @@ -1727,7 +1726,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i if (wacom->wacom_wac.features.type == REMOTE) { error = wacom_initialize_remote(wacom); if (error) - goto fail_remote; + goto fail4; } if ((wacom_wac->features.type == INTUOSHT || @@ -1740,7 +1739,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i } return 0; - fail_remote: wacom_destroy_leds(wacom); + fail4: wacom_remove_shared_data(wacom_wac); fail3: usb_free_urb(wacom->irq); wacom_destroy_battery(wacom); @@ -1759,7 +1758,6 @@ static void wacom_disconnect(struct usb_interface *intf) cancel_work_sync(&wacom->wireless_work); cancel_work_sync(&wacom->battery_work); kobject_put(wacom->remote_dir); - wacom_destroy_leds(wacom); wacom_unregister_inputs(wacom); wacom_destroy_battery(wacom); usb_free_urb(wacom->irq); diff --git a/3.17/wacom.h b/3.17/wacom.h index 9f94378..c5162c1 100644 --- a/3.17/wacom.h +++ b/3.17/wacom.h @@ -138,7 +138,6 @@ struct wacom { u8 hlv; /* status led brightness button pressed (1..127) */ u8 img_lum; /* OLED matrix display brightness */ } led; - bool led_initialized; #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) struct power_supply *battery; struct power_supply *ac; diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c index a5c2f44..f4e1fd9 100644 --- a/3.17/wacom_sys.c +++ b/3.17/wacom_sys.c @@ -913,6 +913,45 @@ static struct attribute_group intuos5_led_attr_group = { .attrs = intuos5_led_attrs, }; +struct wacom_sysfs_group_devres { + struct attribute_group *group; + struct kobject *root; +}; + +static void wacom_devm_sysfs_group_release(struct device *dev, void *res) +{ + struct wacom_sysfs_group_devres *devres = res; + struct kobject *kobj = devres->root; + + dev_dbg(dev, "%s: dropping reference to %s\n", + __func__, devres->group->name); + sysfs_remove_group(kobj, devres->group); +} + +static int wacom_devm_sysfs_create_group(struct wacom *wacom, + struct attribute_group *group) +{ + struct wacom_sysfs_group_devres *devres; + int error; + + devres = devres_alloc(wacom_devm_sysfs_group_release, + sizeof(struct wacom_sysfs_group_devres), + GFP_KERNEL); + if (!devres) + return -ENOMEM; + + devres->group = group; + devres->root = &wacom->hdev->dev.kobj; + + error = sysfs_create_group(devres->root, group); + if (error) + return error; + + devres_add(&wacom->hdev->dev, devres); + + return 0; +} + static int wacom_initialize_leds(struct wacom *wacom) { int error; @@ -931,8 +970,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.llv = 10; wacom->led.hlv = 20; wacom->led.img_lum = 10; - error = sysfs_create_group(&wacom->hdev->dev.kobj, - &intuos4_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &intuos4_led_attr_group); break; case WACOM_24HD: @@ -943,8 +982,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->hdev->dev.kobj, - &cintiq_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &cintiq_led_attr_group); break; case INTUOS5S: @@ -959,8 +998,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->hdev->dev.kobj, - &intuos5_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &intuos5_led_attr_group); break; default: @@ -973,48 +1012,10 @@ static int wacom_initialize_leds(struct wacom *wacom) return error; } wacom_led_control(wacom); - wacom->led_initialized = true; return 0; } -static void wacom_destroy_leds(struct wacom *wacom) -{ - if (!wacom->led_initialized) - return; - - if (!(wacom->wacom_wac.features.device_type & WACOM_DEVICETYPE_PAD)) - return; - - wacom->led_initialized = false; - - switch (wacom->wacom_wac.features.type) { - case INTUOS4S: - case INTUOS4: - case INTUOS4WL: - case INTUOS4L: - sysfs_remove_group(&wacom->hdev->dev.kobj, - &intuos4_led_attr_group); - break; - - case WACOM_24HD: - case WACOM_21UX2: - sysfs_remove_group(&wacom->hdev->dev.kobj, - &cintiq_led_attr_group); - break; - - case INTUOS5S: - case INTUOS5: - case INTUOS5L: - case INTUOSPS: - case INTUOSPM: - case INTUOSPL: - sysfs_remove_group(&wacom->hdev->dev.kobj, - &intuos5_led_attr_group); - break; - } -} - static enum power_supply_property wacom_battery_props[] = { POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_STATUS, @@ -1777,7 +1778,6 @@ fail_quirks: fail_hw_start: kobject_put(wacom->remote_dir); fail_remote: - wacom_destroy_leds(wacom); fail_leds: fail_register_inputs: #if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) @@ -1814,14 +1814,12 @@ static void wacom_wireless_work(struct work_struct *work) hdev1 = usb_get_intfdata(usbdev->config->interface[1]); wacom1 = hid_get_drvdata(hdev1); wacom_wac1 = &(wacom1->wacom_wac); - wacom_destroy_leds(wacom1); wacom_release_resources(wacom1); /* Touch interface */ hdev2 = usb_get_intfdata(usbdev->config->interface[2]); wacom2 = hid_get_drvdata(hdev2); wacom_wac2 = &(wacom2->wacom_wac); - wacom_destroy_leds(wacom2); wacom_release_resources(wacom2); if (wacom_wac->pid == 0) { @@ -1876,9 +1874,7 @@ static void wacom_wireless_work(struct work_struct *work) return; fail: - wacom_destroy_leds(wacom1); wacom_release_resources(wacom1); - wacom_destroy_leds(wacom2); wacom_release_resources(wacom2); return; } @@ -1968,7 +1964,6 @@ static void wacom_remove(struct hid_device *hdev) cancel_work_sync(&wacom->wireless_work); cancel_work_sync(&wacom->battery_work); kobject_put(wacom->remote_dir); - wacom_destroy_leds(wacom); if (hdev->bus == BUS_BLUETOOTH) device_remove_file(&hdev->dev, &dev_attr_speed); #if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) diff --git a/3.7/wacom.h b/3.7/wacom.h index fd039dd..1666882 100644 --- a/3.7/wacom.h +++ b/3.7/wacom.h @@ -130,7 +130,6 @@ struct wacom { u8 hlv; /* status led brightness button pressed (1..127) */ u8 img_lum; /* OLED matrix display brightness */ } led; - bool led_initialized; struct power_supply battery; struct kobject *remote_dir; struct attribute_group remote_group[5]; diff --git a/3.7/wacom_sys.c b/3.7/wacom_sys.c index 33b7ee7..7948ab8 100644 --- a/3.7/wacom_sys.c +++ b/3.7/wacom_sys.c @@ -1034,6 +1034,45 @@ static struct attribute_group intuos5_led_attr_group = { .attrs = intuos5_led_attrs, }; +struct wacom_sysfs_group_devres { + struct attribute_group *group; + struct kobject *root; +}; + +static void wacom_devm_sysfs_group_release(struct device *dev, void *res) +{ + struct wacom_sysfs_group_devres *devres = res; + struct kobject *kobj = devres->root; + + dev_dbg(dev, "%s: dropping reference to %s\n", + __func__, devres->group->name); + sysfs_remove_group(kobj, devres->group); +} + +static int wacom_devm_sysfs_create_group(struct wacom *wacom, + struct attribute_group *group) +{ + struct wacom_sysfs_group_devres *devres; + int error; + + devres = devres_alloc(wacom_devm_sysfs_group_release, + sizeof(struct wacom_sysfs_group_devres), + GFP_KERNEL); + if (!devres) + return -ENOMEM; + + devres->group = group; + devres->root = &wacom->intf->dev.kobj; + + error = sysfs_create_group(devres->root, group); + if (error) + return error; + + devres_add(&wacom->intf->dev, devres); + + return 0; +} + static int wacom_initialize_leds(struct wacom *wacom) { int error; @@ -1051,8 +1090,9 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.llv = 10; wacom->led.hlv = 20; wacom->led.img_lum = 10; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); + + error = wacom_devm_sysfs_create_group(wacom, + &intuos4_led_attr_group); break; case WACOM_24HD: @@ -1063,8 +1103,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &cintiq_led_attr_group); break; case INTUOS5S: @@ -1079,8 +1119,8 @@ static int wacom_initialize_leds(struct wacom *wacom) wacom->led.hlv = 0; wacom->led.img_lum = 0; - error = sysfs_create_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); + error = wacom_devm_sysfs_create_group(wacom, + &intuos5_led_attr_group); break; default: @@ -1093,48 +1133,10 @@ static int wacom_initialize_leds(struct wacom *wacom) return error; } wacom_led_control(wacom); - wacom->led_initialized = true; return 0; } -static void wacom_destroy_leds(struct wacom *wacom) -{ - - if (!wacom->led_initialized) - return; - - wacom->led_initialized = false; - - if (wacom->wacom_wac.features.device_type != BTN_TOOL_PEN) - return; - - switch (wacom->wacom_wac.features.type) { - case INTUOS4S: - case INTUOS4: - case INTUOS4L: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos4_led_attr_group); - break; - - case WACOM_24HD: - case WACOM_21UX2: - sysfs_remove_group(&wacom->intf->dev.kobj, - &cintiq_led_attr_group); - break; - - case INTUOS5S: - case INTUOS5: - case INTUOS5L: - case INTUOSPS: - case INTUOSPM: - case INTUOSPL: - sysfs_remove_group(&wacom->intf->dev.kobj, - &intuos5_led_attr_group); - break; - } -} - static enum power_supply_property wacom_battery_props[] = { POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_STATUS, @@ -1506,13 +1508,11 @@ static void wacom_wireless_work(struct work_struct *work) /* Stylus interface */ wacom1 = usb_get_intfdata(usbdev->config->interface[1]); wacom_wac1 = &(wacom1->wacom_wac); - wacom_destroy_leds(wacom1); wacom_unregister_inputs(wacom1); /* Touch interface */ wacom2 = usb_get_intfdata(usbdev->config->interface[2]); wacom_wac2 = &(wacom2->wacom_wac); - wacom_destroy_leds(wacom2); wacom_unregister_inputs(wacom2); if (wacom_wac->pid == 0) { @@ -1591,9 +1591,7 @@ static void wacom_wireless_work(struct work_struct *work) return; fail: - wacom_destroy_leds(wacom1); wacom_unregister_inputs(wacom1); - wacom_destroy_leds(wacom2); wacom_unregister_inputs(wacom2); return; } @@ -1724,7 +1722,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i if (wacom->wacom_wac.features.type == REMOTE) { error = wacom_initialize_remote(wacom); if (error) - goto fail_remote; + goto fail4; } if ((wacom_wac->features.type == INTUOSHT || @@ -1738,8 +1736,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i return 0; - fail_remote: - wacom_destroy_leds(wacom); fail4: wacom_remove_shared_data(wacom_wac); fail3: usb_free_urb(wacom->irq); wacom_destroy_battery(wacom); @@ -1758,7 +1754,6 @@ static void wacom_disconnect(struct usb_interface *intf) cancel_work_sync(&wacom->wireless_work); cancel_work_sync(&wacom->battery_work); kobject_put(wacom->remote_dir); - wacom_destroy_leds(wacom); wacom_unregister_inputs(wacom); wacom_destroy_battery(wacom); usb_free_urb(wacom->irq); -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
