shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 20:25:38 +03:00
Code

libudev: device - remove udev_device_get_parent_with_subsystem

Browse Source
This commit is contained in:
Marcel Holtmann 2009-01-03 11:13:51 +01:00 committed by Kay Sievers
parent 883012d49b
commit 61ee8cc92d
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extras/usb_id/usb_id.c
View File

@ -192,7 +192,7 @@ static int usb_id(struct udev_device *dev)
dbg(udev, "syspath %s\n", udev_device_get_syspath(dev)); dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
/* usb interface directory */ /* usb interface directory */
dev_interface = udev_device_get_parent_with_subsystem(dev, "usb"); dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb", NULL);
if (dev_interface == NULL) { if (dev_interface == NULL) {
info(udev, "unable to access usb_interface device of '%s'\n", info(udev, "unable to access usb_interface device of '%s'\n",
udev_device_get_syspath(dev)); udev_device_get_syspath(dev));
@ -218,7 +218,7 @@ static int usb_id(struct udev_device *dev)
udev_device_get_syspath(dev_interface), if_class_num, protocol); udev_device_get_syspath(dev_interface), if_class_num, protocol);
/* usb device directory */ /* usb device directory */
dev_usb = udev_device_get_parent_with_subsystem(dev_interface, "usb"); dev_usb = udev_device_get_parent_with_subsystem_devtype(dev_interface, "usb", NULL);
if (!dev_usb) { if (!dev_usb) {
info(udev, "unable to find parent 'usb' device of '%s'\n", info(udev, "unable to find parent 'usb' device of '%s'\n",
udev_device_get_syspath(dev)); udev_device_get_syspath(dev));
@ -232,7 +232,7 @@ static int usb_id(struct udev_device *dev)
int host, bus, target, lun; int host, bus, target, lun;
/* get scsi device */ /* get scsi device */
dev_scsi = udev_device_get_parent_with_subsystem(dev, "scsi"); dev_scsi = udev_device_get_parent_with_subsystem_devtype(dev, "scsi", NULL);
if (dev_scsi == NULL) { if (dev_scsi == NULL) {
info(udev, "unable to find parent 'scsi' device of '%s'\n", info(udev, "unable to find parent 'scsi' device of '%s'\n",
udev_device_get_syspath(dev)); udev_device_get_syspath(dev));

1
udev/lib/exported_symbols
View File

@ -16,7 +16,6 @@ udev_device_new_from_syspath
udev_device_new_from_devnum udev_device_new_from_devnum
udev_device_new_from_subsystem_sysname udev_device_new_from_subsystem_sysname
udev_device_get_parent udev_device_get_parent
udev_device_get_parent_with_subsystem
udev_device_get_parent_with_subsystem_devtype udev_device_get_parent_with_subsystem_devtype
udev_device_ref udev_device_ref
udev_device_unref udev_device_unref

16
udev/lib/libudev-device.c
View File

@ -541,22 +541,6 @@ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
return udev_device->parent_device; return udev_device->parent_device;
} }
struct udev_device *udev_device_get_parent_with_subsystem(struct udev_device *udev_device, const char *subsystem)
{
struct udev_device *parent;
parent = udev_device_get_parent(udev_device);
while (parent != NULL) {
const char *parent_subsystem;
parent_subsystem = udev_device_get_subsystem(parent);
if (parent_subsystem != NULL && strcmp(parent_subsystem, subsystem) == 0)
break;
parent = udev_device_get_parent(parent);
}
return parent;
}
struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype) struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype)
{ {
struct udev_device *parent; struct udev_device *parent;

1
udev/lib/libudev.h
View File

@ -62,7 +62,6 @@ extern struct udev_device *udev_device_new_from_syspath(struct udev *udev, const
extern struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum); extern struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum);
extern struct udev_device *udev_device_new_from_subsystem_sysname(struct udev *udev, const char *subsystem, const char *sysname); extern struct udev_device *udev_device_new_from_subsystem_sysname(struct udev *udev, const char *subsystem, const char *sysname);
extern struct udev_device *udev_device_get_parent(struct udev_device *udev_device); extern struct udev_device *udev_device_get_parent(struct udev_device *udev_device);
extern struct udev_device *udev_device_get_parent_with_subsystem(struct udev_device *udev_device, const char *subsystem);
extern struct udev_device *udev_device_get_parent_with_subsytem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype); extern struct udev_device *udev_device_get_parent_with_subsytem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype);
extern struct udev_device *udev_device_ref(struct udev_device *udev_device); extern struct udev_device *udev_device_ref(struct udev_device *udev_device);
extern void udev_device_unref(struct udev_device *udev_device); extern void udev_device_unref(struct udev_device *udev_device);