diff mbox series

[02/11] Revert "HID: playstation: report DualSense hardware and firmware version."

Message ID 20210217173158.3122868-3-benjamin.tissoires@redhat.com (mailing list archive)
State New
Delegated to: Jiri Kosina
Headers show
Series HID: playstation: revert LED class exposure | expand

Commit Message

Benjamin Tissoires Feb. 17, 2021, 5:31 p.m. UTC
This reverts commit 1f902f8636e4 ("HID: playstation: report DualSense
hardware and firmware version.")

There is currently an ongoing discussion on linux-leds LKML,
and so to give us more room, we need to revert those related
LEDs patches from linux-next.

To have a cleaner merge with the new version, we also revert
all patches on top of the LED ones.

This is not a big deal, they are still not pushed to Linus.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
 drivers/hid/hid-playstation.c | 81 -----------------------------------
 1 file changed, 81 deletions(-)
diff mbox series

Patch

diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index cc93c16cc822..973c1fe61e8a 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -41,8 +41,6 @@  struct ps_device {
 	int battery_status;
 
 	uint8_t mac_address[6]; /* Note: stored in little endian order. */
-	uint32_t hw_version;
-	uint32_t fw_version;
 
 	int (*parse_report)(struct ps_device *dev, struct hid_report *report, u8 *data, int size);
 };
@@ -79,8 +77,6 @@  struct ps_led_info {
 #define DS_FEATURE_REPORT_CALIBRATION_SIZE	41
 #define DS_FEATURE_REPORT_PAIRING_INFO		0x09
 #define DS_FEATURE_REPORT_PAIRING_INFO_SIZE	20
-#define DS_FEATURE_REPORT_FIRMWARE_INFO		0x20
-#define DS_FEATURE_REPORT_FIRMWARE_INFO_SIZE	64
 
 /* Button masks for DualSense input report. */
 #define DS_BUTTONS0_HAT_SWITCH	GENMASK(3, 0)
@@ -665,40 +661,6 @@  static struct input_dev *ps_touchpad_create(struct hid_device *hdev, int width,
 	return touchpad;
 }
 
-static ssize_t firmware_version_show(struct device *dev,
-				struct device_attribute
-				*attr, char *buf)
-{
-	struct hid_device *hdev = to_hid_device(dev);
-	struct ps_device *ps_dev = hid_get_drvdata(hdev);
-
-	return sysfs_emit(buf, "0x%08x\n", ps_dev->fw_version);
-}
-
-static DEVICE_ATTR_RO(firmware_version);
-
-static ssize_t hardware_version_show(struct device *dev,
-				struct device_attribute
-				*attr, char *buf)
-{
-	struct hid_device *hdev = to_hid_device(dev);
-	struct ps_device *ps_dev = hid_get_drvdata(hdev);
-
-	return sysfs_emit(buf, "0x%08x\n", ps_dev->hw_version);
-}
-
-static DEVICE_ATTR_RO(hardware_version);
-
-static struct attribute *ps_device_attributes[] = {
-	&dev_attr_firmware_version.attr,
-	&dev_attr_hardware_version.attr,
-	NULL
-};
-
-static const struct attribute_group ps_device_attribute_group = {
-	.attrs = ps_device_attributes,
-};
-
 static int dualsense_get_calibration_data(struct dualsense *ds)
 {
 	short gyro_pitch_bias, gyro_pitch_plus, gyro_pitch_minus;
@@ -789,30 +751,6 @@  static int dualsense_get_calibration_data(struct dualsense *ds)
 	return ret;
 }
 
-static int dualsense_get_firmware_info(struct dualsense *ds)
-{
-	uint8_t *buf;
-	int ret;
-
-	buf = kzalloc(DS_FEATURE_REPORT_FIRMWARE_INFO_SIZE, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
-
-	ret = ps_get_report(ds->base.hdev, DS_FEATURE_REPORT_FIRMWARE_INFO, buf,
-			DS_FEATURE_REPORT_FIRMWARE_INFO_SIZE);
-	if (ret) {
-		hid_err(ds->base.hdev, "Failed to retrieve DualSense firmware info: %d\n", ret);
-		goto err_free;
-	}
-
-	ds->base.hw_version = get_unaligned_le32(&buf[24]);
-	ds->base.fw_version = get_unaligned_le32(&buf[28]);
-
-err_free:
-	kfree(buf);
-	return ret;
-}
-
 static int dualsense_get_mac_address(struct dualsense *ds)
 {
 	uint8_t *buf;
@@ -1314,12 +1252,6 @@  static struct ps_device *dualsense_create(struct hid_device *hdev)
 	}
 	snprintf(hdev->uniq, sizeof(hdev->uniq), "%pMR", ds->base.mac_address);
 
-	ret = dualsense_get_firmware_info(ds);
-	if (ret) {
-		hid_err(hdev, "Failed to get firmware info from DualSense\n");
-		return ERR_PTR(ret);
-	}
-
 	ret = ps_devices_list_add(ps_dev);
 	if (ret)
 		return ERR_PTR(ret);
@@ -1387,13 +1319,6 @@  static struct ps_device *dualsense_create(struct hid_device *hdev)
 	/* Set player LEDs to our player id. */
 	dualsense_set_player_leds(ds);
 
-	/*
-	 * Reporting hardware and firmware is important as there are frequent updates, which
-	 * can change behavior.
-	 */
-	hid_info(hdev, "Registered DualSense controller hw_version=0x%08x fw_version=0x%08x\n",
-			ds->base.hw_version, ds->base.fw_version);
-
 	return &ds->base;
 
 err:
@@ -1444,12 +1369,6 @@  static int ps_probe(struct hid_device *hdev, const struct hid_device_id *id)
 		}
 	}
 
-	ret = devm_device_add_group(&hdev->dev, &ps_device_attribute_group);
-	if (ret) {
-		hid_err(hdev, "Failed to register sysfs nodes.\n");
-		goto err_close;
-	}
-
 	return ret;
 
 err_close: