DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

hidraw: remove now useless storage of the udev hidraw node

Browse Source 
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2015-10-07 16:22:48 -04:00
parent 00f8f90288
commit 4538d03b36
2 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/libratbag-hidraw.c
View File

@@ -133,41 +133,26 @@ out:
return hidraw_udev;
}
static int
ratbag_device_init_hidraw(struct ratbag_device *device)
{
struct udev_device *hidraw_udev;
int rc = -ENODEV;
hidraw_udev = udev_find_hidraw(device);
if (!hidraw_udev)
goto out;
device->hidraw.udev_hidraw = udev_device_ref(hidraw_udev);
log_debug(device->ratbag,
"%s is device '%s'.\n",
device->name,
udev_device_get_devnode(device->hidraw.udev_hidraw));
rc = 0;
udev_device_unref(hidraw_udev);
out:
return rc;
}
int
ratbag_open_hidraw(struct ratbag_device *device)
{
struct hidraw_devinfo info;
struct udev_device *hidraw_udev;
int fd, res;
const char *devnode;
res = ratbag_device_init_hidraw(device);
if (res)
return res;
device->hidraw.fd = -1;
devnode = udev_device_get_devnode(device->hidraw.udev_hidraw);
hidraw_udev = udev_find_hidraw(device);
if (!hidraw_udev)
return -ENODEV;
log_debug(device->ratbag,
"%s is device '%s'.\n",
device->name,
udev_device_get_devnode(hidraw_udev));
devnode = udev_device_get_devnode(hidraw_udev);
fd = ratbag_open_path(device, devnode, O_RDWR);
if (fd < 0)
goto err;
@@ -199,9 +184,11 @@ ratbag_open_hidraw(struct ratbag_device *device)
ratbag_hidraw_parse_report_descriptor(device);
}
udev_device_unref(hidraw_udev);
return 0;
err:
udev_device_unref(hidraw_udev);
if (fd >= 0)
ratbag_close_fd(device, fd);
return -errno;
@@ -226,9 +213,6 @@ ratbag_close_hidraw(struct ratbag_device *device)
if (device->hidraw.fd < 0)
return;
if (device->hidraw.udev_hidraw)
udev_device_unref(device->hidraw.udev_hidraw);
ratbag_close_fd(device, device->hidraw.fd);
device->hidraw.fd = -1;

1
src/libratbag-hidraw.h
View File

@@ -38,7 +38,6 @@ struct ratbag_hidraw {
int fd;
uint8_t *report_ids;
unsigned num_report_ids;
struct udev_device *udev_hidraw;
};
/**