In preparation for struct class_device -> struct device input core
conversion, switch to using input_dev->dev.parent when specifying
device position in sysfs tree.
Also, do not access input_dev->private directly, use helpers and
do not use kfree() on input device, use input_free_device() instead.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
static int hidp_hidinput_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{
static int hidp_hidinput_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{
- struct hid_device *hid = dev->private;
+ struct hid_device *hid = input_get_drvdata(dev);
struct hidp_session *session = hid->driver_data;
return hidp_queue_event(session, dev, type, code, value);
struct hidp_session *session = hid->driver_data;
return hidp_queue_event(session, dev, type, code, value);
static int hidp_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{
static int hidp_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{
- struct hidp_session *session = dev->private;
+ struct hidp_session *session = input_get_drvdata(dev);
return hidp_queue_event(session, dev, type, code, value);
}
return hidp_queue_event(session, dev, type, code, value);
}
struct input_dev *input = session->input;
int i;
struct input_dev *input = session->input;
int i;
- input->private = session;
+ input_set_drvdata(input, session);
input->name = "Bluetooth HID Boot Protocol Device";
input->name = "Bluetooth HID Boot Protocol Device";
input->relbit[0] |= BIT(REL_WHEEL);
}
input->relbit[0] |= BIT(REL_WHEEL);
}
- input->cdev.dev = hidp_get_device(session);
+ input->dev.parent = hidp_get_device(session);
input->event = hidp_input_event;
input->event = hidp_input_event;
if (session->hid)
hid_free_device(session->hid);
if (session->hid)
hid_free_device(session->hid);
+ input_free_device(session->input);
kfree(session);
return err;
}
kfree(session);
return err;
}