Commit 0cc62caf authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Marcel Holtmann
Browse files

Bluetooth: hci_intel: drop strange le16_to_cpu() against u8 values 



Sparse rightfully complains:

  hci_intel.c:696:26: warning: cast to restricted __le16
  hci_intel.c:701:26: warning: cast to restricted __le16
  hci_intel.c:702:26: warning: cast to restricted __le16
  hci_intel.c:703:26: warning: cast to restricted __le16
  hci_intel.c:725:26: warning: cast to restricted __le16
  hci_intel.c:730:26: warning: cast to restricted __le16
  hci_intel.c:731:26: warning: cast to restricted __le16
  hci_intel.c:732:26: warning: cast to restricted __le16

because we access non-restricted types with le16_to_cpu().
More confusion is added by using above against u8. On big-endian
architecture we will get all zeroes. I bet it's not what should be
in such case.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 65a24d4c

drivers/bluetooth/hci_intel.c

+4 −10
Original line number Diff line number Diff line
@@ -693,14 +693,11 @@ static int intel_setup(struct hci_uart *hu) 
	case 0x0b:      /* SfP */

	case 0x0c:      /* WsP */

		snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi",

			 le16_to_cpu(ver.hw_variant),

			 le16_to_cpu(params.dev_revid));

			 ver.hw_variant, le16_to_cpu(params.dev_revid));

		break;

	case 0x12:      /* ThP */

		snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u-%u.sfi",

			 le16_to_cpu(ver.hw_variant),

			 le16_to_cpu(ver.hw_revision),

			 le16_to_cpu(ver.fw_revision));

			 ver.hw_variant, ver.hw_revision, ver.fw_revision);

		break;

	default:

		bt_dev_err(hdev, "Unsupported Intel hardware variant (%u)",
@@ -722,14 +719,11 @@ static int intel_setup(struct hci_uart *hu) 
	case 0x0b:      /* SfP */

	case 0x0c:      /* WsP */

		snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.ddc",

			 le16_to_cpu(ver.hw_variant),

			 le16_to_cpu(params.dev_revid));

			 ver.hw_variant, le16_to_cpu(params.dev_revid));

		break;

	case 0x12:      /* ThP */

		snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u-%u.ddc",

			 le16_to_cpu(ver.hw_variant),

			 le16_to_cpu(ver.hw_revision),

			 le16_to_cpu(ver.fw_revision));

			 ver.hw_variant, ver.hw_revision, ver.fw_revision);

		break;

	default:

		bt_dev_err(hdev, "Unsupported Intel hardware variant (%u)",