| Message ID | 5cbde2b4-69b5-4b25-a095-251c8347cb09@kili.mountain |
|---|---|
| State | New |
| Headers | show |
| Series | Bluetooth: hci_conn: clean up some casts | expand |
Hi Dan, On Mon, Jul 17, 2023 at 3:20 AM Dan Carpenter <dan.carpenter@linaro.org> wrote: > > The ERR_PTR/PTR_ERR() functions are only for error pointers. They're > not a generic way to cast pointers to int. > > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > We should really create INT_PTR/PTR_INT() functions. But this is a > cleanup until someone creates those. Is there any reason you didn't create such macros? I mean we could have it local first, or perhaps we just do HANDLE_PTR/PTR_HANDLE to avoid any confusion. > net/bluetooth/hci_conn.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c > index cccc2b8b60a8..aea6fa12d954 100644 > --- a/net/bluetooth/hci_conn.c > +++ b/net/bluetooth/hci_conn.c > @@ -873,7 +873,7 @@ static void bis_cleanup(struct hci_conn *conn) > > static int remove_cig_sync(struct hci_dev *hdev, void *data) > { > - u8 handle = PTR_ERR(data); > + u8 handle = (unsigned long)data; > > return hci_le_remove_cig_sync(hdev, handle); > } > @@ -882,7 +882,7 @@ static int hci_le_remove_cig(struct hci_dev *hdev, u8 handle) > { > bt_dev_dbg(hdev, "handle 0x%2.2x", handle); > > - return hci_cmd_sync_queue(hdev, remove_cig_sync, ERR_PTR(handle), NULL); > + return hci_cmd_sync_queue(hdev, remove_cig_sync, (void *)(unsigned long)handle, NULL); > } > > static void find_cis(struct hci_conn *conn, void *data) > @@ -1234,7 +1234,7 @@ void hci_conn_failed(struct hci_conn *conn, u8 status) > static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) > { > struct hci_conn *conn; > - u16 handle = PTR_ERR(data); > + u16 handle = (unsigned long)data; > > conn = hci_conn_hash_lookup_handle(hdev, handle); > if (!conn) > @@ -1264,7 +1264,7 @@ static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) > static int hci_connect_le_sync(struct hci_dev *hdev, void *data) > { > struct hci_conn *conn; > - u16 handle = PTR_ERR(data); > + u16 handle = (unsigned long)data; > > conn = hci_conn_hash_lookup_handle(hdev, handle); > if (!conn) > @@ -2854,7 +2854,7 @@ u32 hci_conn_get_phy(struct hci_conn *conn) > static int abort_conn_sync(struct hci_dev *hdev, void *data) > { > struct hci_conn *conn; > - u16 handle = PTR_ERR(data); > + u16 handle = (unsigned long)data; > > conn = hci_conn_hash_lookup_handle(hdev, handle); > if (!conn) > -- > 2.39.2 >
On Tue, Jul 18, 2023 at 12:30:57PM -0700, Luiz Augusto von Dentz wrote: > Hi Dan, > > On Mon, Jul 17, 2023 at 3:20 AM Dan Carpenter <dan.carpenter@linaro.org> wrote: > > > > The ERR_PTR/PTR_ERR() functions are only for error pointers. They're > > not a generic way to cast pointers to int. > > > > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > --- > > We should really create INT_PTR/PTR_INT() functions. But this is a > > cleanup until someone creates those. > > Is there any reason you didn't create such macros? I mean we could > have it local first, or perhaps we just do HANDLE_PTR/PTR_HANDLE to > avoid any confusion. > Yeah. I can do that. regards, dan carpenter
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index cccc2b8b60a8..aea6fa12d954 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -873,7 +873,7 @@ static void bis_cleanup(struct hci_conn *conn) static int remove_cig_sync(struct hci_dev *hdev, void *data) { - u8 handle = PTR_ERR(data); + u8 handle = (unsigned long)data; return hci_le_remove_cig_sync(hdev, handle); } @@ -882,7 +882,7 @@ static int hci_le_remove_cig(struct hci_dev *hdev, u8 handle) { bt_dev_dbg(hdev, "handle 0x%2.2x", handle); - return hci_cmd_sync_queue(hdev, remove_cig_sync, ERR_PTR(handle), NULL); + return hci_cmd_sync_queue(hdev, remove_cig_sync, (void *)(unsigned long)handle, NULL); } static void find_cis(struct hci_conn *conn, void *data) @@ -1234,7 +1234,7 @@ void hci_conn_failed(struct hci_conn *conn, u8 status) static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) { struct hci_conn *conn; - u16 handle = PTR_ERR(data); + u16 handle = (unsigned long)data; conn = hci_conn_hash_lookup_handle(hdev, handle); if (!conn) @@ -1264,7 +1264,7 @@ static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err) static int hci_connect_le_sync(struct hci_dev *hdev, void *data) { struct hci_conn *conn; - u16 handle = PTR_ERR(data); + u16 handle = (unsigned long)data; conn = hci_conn_hash_lookup_handle(hdev, handle); if (!conn) @@ -2854,7 +2854,7 @@ u32 hci_conn_get_phy(struct hci_conn *conn) static int abort_conn_sync(struct hci_dev *hdev, void *data) { struct hci_conn *conn; - u16 handle = PTR_ERR(data); + u16 handle = (unsigned long)data; conn = hci_conn_hash_lookup_handle(hdev, handle); if (!conn)
The ERR_PTR/PTR_ERR() functions are only for error pointers. They're not a generic way to cast pointers to int. Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- We should really create INT_PTR/PTR_INT() functions. But this is a cleanup until someone creates those. net/bluetooth/hci_conn.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)