|
|
@@ -31,9 +31,6 @@
|
|
|
#define F54_GET_REPORT 1
|
|
|
#define F54_FORCE_CAL 2
|
|
|
|
|
|
-/* Fixed sizes of reports */
|
|
|
-#define F54_QUERY_LEN 27
|
|
|
-
|
|
|
/* F54 capabilities */
|
|
|
#define F54_CAP_BASELINE (1 << 2)
|
|
|
#define F54_CAP_IMAGE8 (1 << 3)
|
|
|
@@ -95,7 +92,6 @@ struct rmi_f54_reports {
|
|
|
struct f54_data {
|
|
|
struct rmi_function *fn;
|
|
|
|
|
|
- u8 qry[F54_QUERY_LEN];
|
|
|
u8 num_rx_electrodes;
|
|
|
u8 num_tx_electrodes;
|
|
|
u8 capabilities;
|
|
|
@@ -632,22 +628,23 @@ static int rmi_f54_detect(struct rmi_function *fn)
|
|
|
{
|
|
|
int error;
|
|
|
struct f54_data *f54;
|
|
|
+ u8 buf[6];
|
|
|
|
|
|
f54 = dev_get_drvdata(&fn->dev);
|
|
|
|
|
|
error = rmi_read_block(fn->rmi_dev, fn->fd.query_base_addr,
|
|
|
- &f54->qry, sizeof(f54->qry));
|
|
|
+ buf, sizeof(buf));
|
|
|
if (error) {
|
|
|
dev_err(&fn->dev, "%s: Failed to query F54 properties\n",
|
|
|
__func__);
|
|
|
return error;
|
|
|
}
|
|
|
|
|
|
- f54->num_rx_electrodes = f54->qry[0];
|
|
|
- f54->num_tx_electrodes = f54->qry[1];
|
|
|
- f54->capabilities = f54->qry[2];
|
|
|
- f54->clock_rate = f54->qry[3] | (f54->qry[4] << 8);
|
|
|
- f54->family = f54->qry[5];
|
|
|
+ f54->num_rx_electrodes = buf[0];
|
|
|
+ f54->num_tx_electrodes = buf[1];
|
|
|
+ f54->capabilities = buf[2];
|
|
|
+ f54->clock_rate = buf[3] | (buf[4] << 8);
|
|
|
+ f54->family = buf[5];
|
|
|
|
|
|
rmi_dbg(RMI_DEBUG_FN, &fn->dev, "F54 num_rx_electrodes: %d\n",
|
|
|
f54->num_rx_electrodes);
|