[PATCH 3/3] HID: steelseries: Use device data for battery requests

[Benjamin Wheeler <benjaminwheeler0510@gmail.com>]

This eliminates several functions that are no longer needed.
When making a battery request, the required data to do so is simply
pulled from the device struct.

Signed-off-by: Benjamin Wheeler <benjaminwheeler0510@gmail.com>
---
 drivers/hid/hid-steelseries.c | 93 +++++------------------------------
 1 file changed, 11 insertions(+), 82 deletions(-)

diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c
index dabc4763f072..1200213bc8f3 100644
--- a/drivers/hid/hid-steelseries.c
+++ b/drivers/hid/hid-steelseries.c
@@ -809,44 +809,17 @@ static enum power_supply_property steelseries_battery_props[] = {
 	POWER_SUPPLY_PROP_CAPACITY_LEVEL,
 };
 
-/* Forward declarations for battery request functions */
-static int steelseries_arctis_1_request_battery(struct hid_device *hdev);
-static int steelseries_arctis_7_plus_request_battery(struct hid_device *hdev);
-static int steelseries_arctis_9_request_battery(struct hid_device *hdev);
-static int steelseries_arctis_nova_request_battery(struct hid_device *hdev);
-static int steelseries_arctis_nova_3p_request_battery(struct hid_device *hdev);
-static int
-steelseries_arctis_pro_wireless_request_battery(struct hid_device *hdev);
+static int __steelseries_send_report(struct hid_device *const hdev,
+				     const u8 *const data, const size_t len,
+				     const enum hid_report_type type);
 
-static int steelseries_request_battery(struct hid_device *hdev)
+static int
+steelseries_request_battery(const struct steelseries_device *const sd)
 {
-	u16 product = hdev->product;
-
-	/* Route to device-specific battery request handler */
-	if (product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1 ||
-	    product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X ||
-	    product == USB_DEVICE_ID_STEELSERIES_ARCTIS_7_P ||
-	    product == USB_DEVICE_ID_STEELSERIES_ARCTIS_7_X)
-		return steelseries_arctis_1_request_battery(hdev);
-
-	if (product == USB_DEVICE_ID_STEELSERIES_ARCTIS_7_PLUS ||
-	    product == USB_DEVICE_ID_STEELSERIES_ARCTIS_7_PLUS_P ||
-	    product == USB_DEVICE_ID_STEELSERIES_ARCTIS_7_PLUS_X ||
-	    product == USB_DEVICE_ID_STEELSERIES_ARCTIS_7_PLUS_DESTINY)
-		return steelseries_arctis_7_plus_request_battery(hdev);
-
-	if (product == USB_DEVICE_ID_STEELSERIES_ARCTIS_9)
-		return steelseries_arctis_9_request_battery(hdev);
-
-	if (product == USB_DEVICE_ID_STEELSERIES_ARCTIS_PRO)
-		return steelseries_arctis_pro_wireless_request_battery(hdev);
-
-	if (product == USB_DEVICE_ID_STEELSERIES_ARCTIS_NOVA_3_P ||
-	    product == USB_DEVICE_ID_STEELSERIES_ARCTIS_NOVA_3_X)
-		return steelseries_arctis_nova_3p_request_battery(hdev);
-
-	/* All other Nova series use the same battery request */
-	return steelseries_arctis_nova_request_battery(hdev);
+	const struct steelseries_report_data *const report_data =
+		sd->info->report_data; // Alias
+	return __steelseries_send_report(sd->hdev, report_data->data,
+					 report_data->len, report_data->type);
 }
 
 static void steelseries_battery_timer_tick(struct work_struct *work)
@@ -854,7 +827,7 @@ static void steelseries_battery_timer_tick(struct work_struct *work)
 	struct steelseries_device *sd = container_of(
 		work, struct steelseries_device, battery_work.work);
 
-	steelseries_request_battery(sd->hdev);
+	steelseries_request_battery(sd);
 }
 
 static int steelseries_battery_register(struct steelseries_device *sd)
@@ -895,7 +868,7 @@ static int steelseries_battery_register(struct steelseries_device *sd)
 	power_supply_powers(sd->battery, &sd->hdev->dev);
 
 	INIT_DELAYED_WORK(&sd->battery_work, steelseries_battery_timer_tick);
-	steelseries_request_battery(sd->hdev);
+	steelseries_request_battery(sd);
 
 	/* Arctis 9 may need a retry */
 	if (sd->hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_9) {
@@ -1685,50 +1658,6 @@ static const struct attribute_group steelseries_attr_group = {
 	.is_visible = steelseries_attr_is_visible,
 };
 
-static int steelseries_arctis_1_request_battery(struct hid_device *hdev)
-{
-	const u8 data[] = { 0x06, 0x12 };
-
-	return steelseries_send_feature_report(hdev, data, sizeof(data));
-}
-
-static int steelseries_arctis_7_plus_request_battery(struct hid_device *hdev)
-{
-	const u8 data[] = { 0x00, 0xb0 };
-
-	return steelseries_send_output_report(hdev, data, sizeof(data));
-}
-
-static int steelseries_arctis_9_request_battery(struct hid_device *hdev)
-{
-	const u8 data[] = { 0x00, 0x20 };
-
-	return steelseries_send_feature_report(hdev, data, sizeof(data));
-}
-
-static int steelseries_arctis_nova_request_battery(struct hid_device *hdev)
-{
-	const u8 data[] = { 0x00, 0xb0 };
-
-	return steelseries_send_output_report(hdev, data, sizeof(data));
-}
-
-static int steelseries_arctis_nova_3p_request_battery(struct hid_device *hdev)
-{
-	const u8 data[] = { 0xb0 };
-
-	return steelseries_send_output_report(hdev, data, sizeof(data));
-}
-
-static int
-steelseries_arctis_pro_wireless_request_battery(struct hid_device *hdev)
-{
-	/* Request battery - response will arrive asynchronously via raw_event */
-	const u8 data[] = { 0x40, 0xAA };
-
-	return steelseries_send_output_report(hdev, data, sizeof(data));
-}
-
 static int steelseries_raw_event(struct hid_device *hdev,
 				 struct hid_report *report, u8 *data, int size)
 {
-- 
2.52.0