]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ieee802154: ca8210: Use proper setters and getters for bitwise types
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 5 Mar 2025 10:55:34 +0000 (12:55 +0200)
committerStefan Schmidt <stefan@datenfreihafen.org>
Thu, 6 Mar 2025 20:55:17 +0000 (21:55 +0100)
Sparse complains that the driver doesn't respect the bitwise types:

drivers/net/ieee802154/ca8210.c:1796:27: warning: incorrect type in assignment (different base types)
drivers/net/ieee802154/ca8210.c:1796:27:    expected restricted __le16 [addressable] [assigned] [usertype] pan_id
drivers/net/ieee802154/ca8210.c:1796:27:    got unsigned short [usertype]
drivers/net/ieee802154/ca8210.c:1801:25: warning: incorrect type in assignment (different base types)
drivers/net/ieee802154/ca8210.c:1801:25:    expected restricted __le16 [addressable] [assigned] [usertype] pan_id
drivers/net/ieee802154/ca8210.c:1801:25:    got unsigned short [usertype]
drivers/net/ieee802154/ca8210.c:1928:28: warning: incorrect type in argument 3 (different base types)
drivers/net/ieee802154/ca8210.c:1928:28:    expected unsigned short [usertype] dst_pan_id
drivers/net/ieee802154/ca8210.c:1928:28:    got restricted __le16 [addressable] [usertype] pan_id

Use proper setters and getters for bitwise types.

Note, in accordance with [1] the protocol is little endian.

Link: https://www.cascoda.com/wp-content/uploads/2018/11/CA-8210_datasheet_0418.pdf
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/20250305105656.2133487-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
drivers/net/ieee802154/ca8210.c

index 753215ebc67c70e1489f85cc383efb4979bb9308..a036910f60828cd2292d666c4f5565f6db6bb9ed 100644 (file)
@@ -1446,8 +1446,7 @@ static u8 mcps_data_request(
        command.pdata.data_req.src_addr_mode = src_addr_mode;
        command.pdata.data_req.dst.mode = dst_address_mode;
        if (dst_address_mode != MAC_MODE_NO_ADDR) {
-               command.pdata.data_req.dst.pan_id[0] = LS_BYTE(dst_pan_id);
-               command.pdata.data_req.dst.pan_id[1] = MS_BYTE(dst_pan_id);
+               put_unaligned_le16(dst_pan_id, command.pdata.data_req.dst.pan_id);
                if (dst_address_mode == MAC_MODE_SHORT_ADDR) {
                        command.pdata.data_req.dst.address[0] = LS_BYTE(
                                dst_addr->short_address
@@ -1795,12 +1794,12 @@ static int ca8210_skb_rx(
        }
        hdr.source.mode = data_ind[0];
        dev_dbg(&priv->spi->dev, "srcAddrMode: %#03x\n", hdr.source.mode);
-       hdr.source.pan_id = *(u16 *)&data_ind[1];
+       hdr.source.pan_id = cpu_to_le16(get_unaligned_le16(&data_ind[1]));
        dev_dbg(&priv->spi->dev, "srcPanId: %#06x\n", hdr.source.pan_id);
        memcpy(&hdr.source.extended_addr, &data_ind[3], 8);
        hdr.dest.mode = data_ind[11];
        dev_dbg(&priv->spi->dev, "dstAddrMode: %#03x\n", hdr.dest.mode);
-       hdr.dest.pan_id = *(u16 *)&data_ind[12];
+       hdr.dest.pan_id = cpu_to_le16(get_unaligned_le16(&data_ind[12]));
        dev_dbg(&priv->spi->dev, "dstPanId: %#06x\n", hdr.dest.pan_id);
        memcpy(&hdr.dest.extended_addr, &data_ind[14], 8);
 
@@ -1927,7 +1926,7 @@ static int ca8210_skb_tx(
        status =  mcps_data_request(
                header.source.mode,
                header.dest.mode,
-               header.dest.pan_id,
+               le16_to_cpu(header.dest.pan_id),
                (union macaddr *)&header.dest.extended_addr,
                skb->len - mac_len,
                &skb->data[mac_len],