github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 19:43:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "Bluetooth: btusb: add sysfs attribute to control USB alt setting"

Browse Source 
This reverts commit b16b327edb.

The sysfs node introduced by this patch could potentially race with user
space. The original motivation - Support configuring altsetting from the
user space will be added by another series.

Cc: chromeos-bluetooth-upstreaming@chromium.org
Signed-off-by: Hsin-chen Chuang <chharry@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Hsin-chen Chuang 2025-04-16 09:53:38 +00:00 committed by Luiz Augusto von Dentz
parent f330734a63
commit 96ace5519f
1 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/bluetooth/btusb.c
View File

@ -3734,32 +3734,6 @@ static const struct file_operations force_poll_sync_fops = {
.llseek = default_llseek,
};
static ssize_t isoc_alt_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct btusb_data *data = dev_get_drvdata(dev);
return sysfs_emit(buf, "%d\n", data->isoc_altsetting);
}
static ssize_t isoc_alt_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct btusb_data *data = dev_get_drvdata(dev);
int alt;
int ret;
if (kstrtoint(buf, 10, &alt))
return -EINVAL;
ret = btusb_switch_alt_setting(data->hdev, alt);
return ret < 0 ? ret : count;
}
static DEVICE_ATTR_RW(isoc_alt);
#define BTUSB_HCI_DRV_OP_SUPPORTED_ALTSETTINGS \
hci_opcode_pack(HCI_DRV_OGF_DRIVER_SPECIFIC, 0x0000)
#define BTUSB_HCI_DRV_SUPPORTED_ALTSETTINGS_SIZE 0
@ -4252,10 +4226,6 @@ static int btusb_probe(struct usb_interface *intf,
data->isoc, data);
if (err < 0)
goto out_free_dev;
err = device_create_file(&intf->dev, &dev_attr_isoc_alt);
if (err)
goto out_free_dev;
}
if (IS_ENABLED(CONFIG_BT_HCIBTUSB_BCM) && data->diag) {
@ -4302,10 +4272,8 @@ static void btusb_disconnect(struct usb_interface *intf)
hdev = data->hdev;
usb_set_intfdata(data->intf, NULL);
if (data->isoc) {
device_remove_file(&intf->dev, &dev_attr_isoc_alt);
if (data->isoc)
usb_set_intfdata(data->isoc, NULL);
}
if (data->diag)
usb_set_intfdata(data->diag, NULL);