mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 20:25:38 +03:00
libudev: device - remove udev_device_get_parent_with_subsystem
This commit is contained in:
parent
883012d49b
commit
61ee8cc92d
@ -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));
|
||||||
|
@ -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
|
||||||
|
@ -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;
|
||||||
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user