| Message ID | 20210525182900.9.I3e7a04aaf5320cdfcf3457536e7d4f33eb6d26fa@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Bluetooth: use inclusive language | expand |
Hi Archie, > Use "accept list" and "reject list". > > Signed-off-by: Archie Pusaka <apusaka@chromium.org> > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > > --- > > net/bluetooth/hci_debugfs.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c > index 47f4f21fbc1a..3352e831af3d 100644 > --- a/net/bluetooth/hci_debugfs.c > +++ b/net/bluetooth/hci_debugfs.c > @@ -138,7 +138,7 @@ static int device_list_show(struct seq_file *f, void *ptr) > > DEFINE_SHOW_ATTRIBUTE(device_list); > > -static int blacklist_show(struct seq_file *f, void *p) > +static int reject_list_show(struct seq_file *f, void *p) > { > struct hci_dev *hdev = f->private; > struct bdaddr_list *b; > @@ -151,7 +151,7 @@ static int blacklist_show(struct seq_file *f, void *p) > return 0; > } > > -DEFINE_SHOW_ATTRIBUTE(blacklist); > +DEFINE_SHOW_ATTRIBUTE(reject_list); > > static int blocked_keys_show(struct seq_file *f, void *p) > { > @@ -323,7 +323,7 @@ void hci_debugfs_create_common(struct hci_dev *hdev) > debugfs_create_file("device_list", 0444, hdev->debugfs, hdev, > &device_list_fops); > debugfs_create_file("blacklist", 0444, hdev->debugfs, hdev, > - &blacklist_fops); > + &reject_list_fops); NAK. We are not changing the file names just yet and so there is no point in changing partial function and ops structure names. This needs to go in as complete patch if we decide to change the debugfs file name. Regards Marcel
diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c index 47f4f21fbc1a..3352e831af3d 100644 --- a/net/bluetooth/hci_debugfs.c +++ b/net/bluetooth/hci_debugfs.c @@ -138,7 +138,7 @@ static int device_list_show(struct seq_file *f, void *ptr) DEFINE_SHOW_ATTRIBUTE(device_list); -static int blacklist_show(struct seq_file *f, void *p) +static int reject_list_show(struct seq_file *f, void *p) { struct hci_dev *hdev = f->private; struct bdaddr_list *b; @@ -151,7 +151,7 @@ static int blacklist_show(struct seq_file *f, void *p) return 0; } -DEFINE_SHOW_ATTRIBUTE(blacklist); +DEFINE_SHOW_ATTRIBUTE(reject_list); static int blocked_keys_show(struct seq_file *f, void *p) { @@ -323,7 +323,7 @@ void hci_debugfs_create_common(struct hci_dev *hdev) debugfs_create_file("device_list", 0444, hdev->debugfs, hdev, &device_list_fops); debugfs_create_file("blacklist", 0444, hdev->debugfs, hdev, - &blacklist_fops); + &reject_list_fops); debugfs_create_file("blocked_keys", 0444, hdev->debugfs, hdev, &blocked_keys_fops); debugfs_create_file("uuids", 0444, hdev->debugfs, hdev, &uuids_fops); @@ -778,7 +778,7 @@ static const struct file_operations force_static_address_fops = { .llseek = default_llseek, }; -static int white_list_show(struct seq_file *f, void *ptr) +static int accept_list_show(struct seq_file *f, void *ptr) { struct hci_dev *hdev = f->private; struct bdaddr_list *b; @@ -791,7 +791,7 @@ static int white_list_show(struct seq_file *f, void *ptr) return 0; } -DEFINE_SHOW_ATTRIBUTE(white_list); +DEFINE_SHOW_ATTRIBUTE(accept_list); static int resolv_list_show(struct seq_file *f, void *ptr) { @@ -1197,7 +1197,7 @@ void hci_debugfs_create_le(struct hci_dev *hdev) debugfs_create_u8("white_list_size", 0444, hdev->debugfs, &hdev->le_white_list_size); debugfs_create_file("white_list", 0444, hdev->debugfs, hdev, - &white_list_fops); + &accept_list_fops); debugfs_create_u8("resolv_list_size", 0444, hdev->debugfs, &hdev->le_resolv_list_size); debugfs_create_file("resolv_list", 0444, hdev->debugfs, hdev,