From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 612971F4612 for ; Fri, 11 Apr 2025 13:33:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744378432; cv=none; b=s+4ZaRU5KhEPr6XSsLY47imoohBN5LKvSdg+RUooVLfZ58GuHGbkHNJR5VvMEl2ynMcgXgTX6c0vhSDZIKx9a+sZPzpnR8Ap49+wZsJNF7gL8LzMGaA4PvyE6g0a5Topc+okR6o/1MZW9jstyApvN5OW+sVuKuXyAm/vW485gQQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744378432; c=relaxed/simple; bh=ldPo19FYLkdC9LtTNfMtFSNkiI0cDGvCEhUtivH/b38=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Mt8KfJEuZ7LOuIJYwyMBf6YxE38YYnYDgzfGLnKTpay9ExoxgUV9M2IofJN+uz72wt1JC/WMEWlwm+QKVKE2Sz3kGzPaFooXPdXxMDIIOWnMQfNVEMGJlYOTpCEdwQenaa4WltVQQWqtsYr3eynrYaSh0dUF5kmqKZx3uHEcJeI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--chharry.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=T9kC21xw; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--chharry.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="T9kC21xw" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-736b431ee0dso1562433b3a.0 for ; Fri, 11 Apr 2025 06:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744378431; x=1744983231; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4g2/yGXEKl1OCoyKSP0aAd6iujvLtuHh//72VEdm0hA=; b=T9kC21xwj33s3J7B1YXGx9x32xOEXFXccer0LUsrjI6xd+WV5+z+sP5+dzWQqDi0Av JKVAgxsAUGqRMNgbrXOLVB8zQWRU9ZmNb3IXkGRh51ywHmUqFr24BSOT36GsHoNcKa+I X9C/FIyrSCZnYg/FA7URi0qu602THQMN+06n93HiDOMZ2AFhlSvM081c/pxdW/6TPJix ekE81dAmP1VYHxYvcDydhQKzzRIElVsubfNIAUrXuh5MXIq9uB0gJ9AWP1mu8ESyBgBE Ix3uT0tre3CCa3besMbPefmkDdNsahdDlLNH2vcdjVFBl1XpuCXPKnNivceYz5MNuhNw nWIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744378431; x=1744983231; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4g2/yGXEKl1OCoyKSP0aAd6iujvLtuHh//72VEdm0hA=; b=PSn+WaGqjXbq/kOXzSUxE+IBEv7w/jQqcM3Nc2TrZYHA5JzM5eJjSVAI8izQEaW2uM dl8WKvOeYdcixMy+gChCA8jU63rO0MQ/DZxVfLn1Qwm2CvQMAS3YE2WVWaERUL2YHcGR agWr5XNu23GzBzdwL3cAjo4eBngcp8//L9Z6CrcW3D3jx8AGvs2UiUwrddVbqxh377VH XnD+q/BGKrf2Rj/i1cIy+e1zwGDy9GvnxW+aRwXPu0GoHwO/VDFs3/Yrwn4qQZIC60uY zCFWWmOr5cKSUGojmbM+5XW019KNvMRsLIKbSQXUTn5iNRtInmu6LRH3t7WD0s4K9+Uz 9EBw== X-Forwarded-Encrypted: i=1; AJvYcCXZcJZjYzl1fNrwOPtYZgjmMz0gaC9skTwToa5srdl/rTsRuio07Bvwz2Kcix2Qp/ePBp+BYt1+ODZw3B5FAo8=@vger.kernel.org X-Gm-Message-State: AOJu0YwRZSuaroBPmTg44Id20C/GzgZp2SAyFCgvJei9Zb6zzIQUhqu5 X2KwzC8mifSLgjuiEmxS+dzJtlpTd6nsf31SexMuR7JJJQmiuDI3NvYoto8palq+h7pN9FTasN5 fWN5LXw== X-Google-Smtp-Source: AGHT+IE6SnW+E2UcTarv9RF0JjGVhIc1w/GHbS5+IUmBSxMiMg0FWAXESXXjo+IWqcn9srZlCgeM+oH2+leB X-Received: from pgux9.prod.google.com ([2002:a65:6aa9:0:b0:af2:48c3:360f]) (user=chharry job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:2d0a:b0:1f3:36f7:c0d2 with SMTP id adf61e73a8af0-20179990733mr5205499637.41.1744378430727; Fri, 11 Apr 2025 06:33:50 -0700 (PDT) Date: Fri, 11 Apr 2025 21:33:08 +0800 In-Reply-To: <20250411133330.171563-1-chharry@google.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250411133330.171563-1-chharry@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411133330.171563-4-chharry@google.com> Subject: [PATCH 4/4] Revert "Bluetooth: btusb: add sysfs attribute to control USB alt setting" From: Hsin-chen Chuang To: luiz.dentz@gmail.com Cc: Hsin-chen Chuang , chromeos-bluetooth-upstreaming@chromium.org, Marcel Holtmann , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" From: Hsin-chen Chuang This reverts commit b16b327edb4d030fb4c8fe38c7d299074d47ee3f. 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 --- drivers/bluetooth/btusb.c | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index b7040747b890..304ec6f830f1 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3688,32 +3688,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_DRV_OP_DRIVER_SPECIFIC_BASE #define BTUSB_HCI_DRV_SUPPORTED_ALTSETTINGS_SIZE 0 struct btusb_hci_drv_rp_supported_altsettings { @@ -4197,10 +4171,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) { @@ -4247,10 +4217,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); -- 2.49.0.604.gff1f9ca942-goog