diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2015-10-14 11:16:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-10-15 09:19:15 -0700 |
| commit | b2a637d72df790dbb8550627903c93ec8df4e9f7 (patch) | |
| tree | e72a754af664aa2fa8cf7232f092068576d111e1 /drivers/staging/greybus/hid.c | |
| parent | 1cb9e38c8c17b16b2712aaf2ca4d3509f0fe9366 (diff) | |
greybus: hid: use the bundle struct device instead of the connector
We are removing struct device from the gb_connection structure in the
near future. The gb_bundle structure's struct device should be used as
a replacement.
This patch moves the hid driver to use the bundle pointer instead of the
connection pointer.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'drivers/staging/greybus/hid.c')
| -rw-r--r-- | drivers/staging/greybus/hid.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c index a2f0612076d5..3ac9c1049f1d 100644 --- a/drivers/staging/greybus/hid.c +++ b/drivers/staging/greybus/hid.c @@ -86,7 +86,7 @@ static int gb_hid_set_report(struct gb_hid *ghid, u8 report_type, u8 report_id, ret = gb_operation_request_send_sync(operation); if (ret) { - dev_err(&operation->connection->dev, + dev_err(&operation->connection->bundle->dev, "failed to set report: %d\n", ret); } else { ret = len; @@ -104,7 +104,7 @@ static int gb_hid_irq_handler(u8 type, struct gb_operation *op) struct gb_hid_input_report_request *request = op->request->payload; if (type != GB_HID_TYPE_IRQ_EVENT) { - dev_err(&connection->dev, + dev_err(&connection->bundle->dev, "unsupported unsolicited request\n"); return -EINVAL; } @@ -403,7 +403,7 @@ static int gb_hid_init(struct gb_hid *ghid) hid->driver_data = ghid; hid->ll_driver = &gb_hid_ll_driver; - hid->dev.parent = &ghid->connection->dev; + hid->dev.parent = &ghid->connection->bundle->dev; #if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) hid->hid_get_raw_report = gb_hid_get_raw_report; hid->hid_output_raw_report = gb_hid_output_raw_report; @@ -412,7 +412,8 @@ static int gb_hid_init(struct gb_hid *ghid) /* Set HID device's name */ snprintf(hid->name, sizeof(hid->name), "%s %04hX:%04hX", - dev_name(&ghid->connection->dev), hid->vendor, hid->product); + dev_name(&ghid->connection->bundle->dev), + hid->vendor, hid->product); return 0; } |