Merge tag 'for-5.8/block-2020-06-01' of git://git.kernel.dk/linux-block

[thirdparty/linux.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index edb6fd2032a1b3192461634a2bae11a9211a8b51..de808c5a187b37f9dc2e090e81eadcc3c3591111 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -3212,40 +3212,6 @@ error:
        return ERR_PTR(retval);
 }
 
-/**
- * device_create_vargs - creates a device and registers it with sysfs
- * @class: pointer to the struct class that this device should be registered to
- * @parent: pointer to the parent struct device of this new device, if any
- * @devt: the dev_t for the char device to be added
- * @drvdata: the data to be added to the device for callbacks
- * @fmt: string for the device's name
- * @args: va_list for the device's name
- *
- * This function can be used by char device classes.  A struct device
- * will be created in sysfs, registered to the specified class.
- *
- * A "dev" file will be created, showing the dev_t for the device, if
- * the dev_t is not 0,0.
- * If a pointer to a parent struct device is passed in, the newly created
- * struct device will be a child of that device in sysfs.
- * The pointer to the struct device will be returned from the call.
- * Any further sysfs files that might be required can be created using this
- * pointer.
- *
- * Returns &struct device pointer on success, or ERR_PTR() on error.
- *
- * Note: the struct class passed to this function must have previously
- * been created with a call to class_create().
- */
-struct device *device_create_vargs(struct class *class, struct device *parent,
-                                  dev_t devt, void *drvdata, const char *fmt,
-                                  va_list args)
-{
-       return device_create_groups_vargs(class, parent, devt, drvdata, NULL,
-                                         fmt, args);
-}
-EXPORT_SYMBOL_GPL(device_create_vargs);
-
 /**
  * device_create - creates a device and registers it with sysfs
  * @class: pointer to the struct class that this device should be registered to
@@ -3277,7 +3243,8 @@ struct device *device_create(struct class *class, struct device *parent,
        struct device *dev;
 
        va_start(vargs, fmt);
-       dev = device_create_vargs(class, parent, devt, drvdata, fmt, vargs);
+       dev = device_create_groups_vargs(class, parent, devt, drvdata, NULL,
+                                         fmt, vargs);
        va_end(vargs);
        return dev;
 }