3 files changed, 27 insertions, 27 deletions
diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
index e1743be3190..1c97e7dd130 100644
--- a/drivers/pci/hotplug.c
+++ b/drivers/pci/hotplug.c
@@ -3,8 +3,8 @@
 #include <linux/module.h>
 #include "pci.h"
-int pci_hotplug (struct device *dev, char **envp, int num_envp,
+int pci_uevent(struct device *dev, char **envp, int num_envp,
-                 char *buffer, int buffer_size)
+               char *buffer, int buffer_size)
 {
        struct pci_dev *pdev;
        int i = 0;
@@ -17,34 +17,34 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
        if (!pdev)
                return -ENODEV;
-        if (add_hotplug_env_var(envp, num_envp, &i,
+        if (add_uevent_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
+                           buffer, buffer_size, &length,
-                                "PCI_CLASS=%04X", pdev->class))
+                           "PCI_CLASS=%04X", pdev->class))
                return -ENOMEM;
-        if (add_hotplug_env_var(envp, num_envp, &i,
+        if (add_uevent_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
+                           buffer, buffer_size, &length,
-                                "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
+                           "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
                return -ENOMEM;
-        if (add_hotplug_env_var(envp, num_envp, &i,
+        if (add_uevent_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
+                           buffer, buffer_size, &length,
-                                "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
+                           "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
-                                pdev->subsystem_device))
+                           pdev->subsystem_device))
                return -ENOMEM;
-        if (add_hotplug_env_var(envp, num_envp, &i,
+        if (add_uevent_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
+                           buffer, buffer_size, &length,
-                                "PCI_SLOT_NAME=%s", pci_name(pdev)))
+                           "PCI_SLOT_NAME=%s", pci_name(pdev)))
                return -ENOMEM;
-        if (add_hotplug_env_var(envp, num_envp, &i,
+        if (add_uevent_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
+                           buffer, buffer_size, &length,
-                                "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
+                           "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
-                                pdev->vendor, pdev->device,
+                           pdev->vendor, pdev->device,
-                                pdev->subsystem_vendor, pdev->subsystem_device,
+                           pdev->subsystem_vendor, pdev->subsystem_device,
-                                (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
+                           (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
-                                (u8)(pdev->class)))
+                           (u8)(pdev->class)))
                return -ENOMEM;
        envp[i] = NULL;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index a9046d4b8af..7146b69b812 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -502,8 +502,8 @@ void pci_dev_put(struct pci_dev *dev)
 }
 #ifndef CONFIG_HOTPLUG
-int pci_hotplug (struct device *dev, char **envp, int num_envp,
+int pci_uevent(struct device *dev, char **envp, int num_envp,
-                 char *buffer, int buffer_size)
+               char *buffer, int buffer_size)
 {
        return -ENODEV;
 }
@@ -512,7 +512,7 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
 struct bus_type pci_bus_type = {
        .name           = "pci",
        .match          = pci_bus_match,
-        .hotplug        = pci_hotplug,
+        .uevent         = pci_uevent,
        .suspend        = pci_device_suspend,
        .resume         = pci_device_resume,
        .dev_attrs      = pci_dev_attrs,
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 6527b36c9a6..294849d2459 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -1,7 +1,7 @@
 /* Functions internal to the PCI core code */
-extern int pci_hotplug (struct device *dev, char **envp, int num_envp,
+extern int pci_uevent(struct device *dev, char **envp, int num_envp,
-                         char *buffer, int buffer_size);
+                      char *buffer, int buffer_size);
 extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_cleanup_rom(struct pci_dev *dev);

diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c index e1743be3190..1c97e7dd130 100644 --- a/drivers/pci/hotplug.c +++ b/drivers/pci/hotplug.c
@@ -3,8 +3,8 @@
3	#include <linux/module.h>	3	#include <linux/module.h>
4	#include "pci.h"	4	#include "pci.h"
5		5
6	int pci_hotplug (struct device dev, char *envp, int num_envp,	6	int pci_uevent(struct device dev, char *envp, int num_envp,
7	char *buffer, int buffer_size)	7	char *buffer, int buffer_size)
8	{	8	{
9	struct pci_dev *pdev;	9	struct pci_dev *pdev;
10	int i = 0;	10	int i = 0;
@@ -17,34 +17,34 @@ int pci_hotplug (struct device dev, char *envp, int num_envp,
17	if (!pdev)	17	if (!pdev)
18	return -ENODEV;	18	return -ENODEV;
19		19
20	if (add_hotplug_env_var(envp, num_envp, &i,	20	if (add_uevent_var(envp, num_envp, &i,
21	buffer, buffer_size, &length,	21	buffer, buffer_size, &length,
22	"PCI_CLASS=%04X", pdev->class))	22	"PCI_CLASS=%04X", pdev->class))
23	return -ENOMEM;	23	return -ENOMEM;
24		24
25	if (add_hotplug_env_var(envp, num_envp, &i,	25	if (add_uevent_var(envp, num_envp, &i,
26	buffer, buffer_size, &length,	26	buffer, buffer_size, &length,
27	"PCI_ID=%04X:%04X", pdev->vendor, pdev->device))	27	"PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
28	return -ENOMEM;	28	return -ENOMEM;
29		29
30	if (add_hotplug_env_var(envp, num_envp, &i,	30	if (add_uevent_var(envp, num_envp, &i,
31	buffer, buffer_size, &length,	31	buffer, buffer_size, &length,
32	"PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,	32	"PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
33	pdev->subsystem_device))	33	pdev->subsystem_device))
34	return -ENOMEM;	34	return -ENOMEM;
35		35
36	if (add_hotplug_env_var(envp, num_envp, &i,	36	if (add_uevent_var(envp, num_envp, &i,
37	buffer, buffer_size, &length,	37	buffer, buffer_size, &length,
38	"PCI_SLOT_NAME=%s", pci_name(pdev)))	38	"PCI_SLOT_NAME=%s", pci_name(pdev)))
39	return -ENOMEM;	39	return -ENOMEM;
40		40
41	if (add_hotplug_env_var(envp, num_envp, &i,	41	if (add_uevent_var(envp, num_envp, &i,
42	buffer, buffer_size, &length,	42	buffer, buffer_size, &length,
43	"MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",	43	"MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
44	pdev->vendor, pdev->device,	44	pdev->vendor, pdev->device,
45	pdev->subsystem_vendor, pdev->subsystem_device,	45	pdev->subsystem_vendor, pdev->subsystem_device,
46	(u8)(pdev->class >> 16), (u8)(pdev->class >> 8),	46	(u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
47	(u8)(pdev->class)))	47	(u8)(pdev->class)))
48	return -ENOMEM;	48	return -ENOMEM;
49		49
50	envp[i] = NULL;	50	envp[i] = NULL;


diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index a9046d4b8af..7146b69b812 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c
@@ -502,8 +502,8 @@ void pci_dev_put(struct pci_dev *dev)
502	}	502	}
503		503
504	#ifndef CONFIG_HOTPLUG	504	#ifndef CONFIG_HOTPLUG
505	int pci_hotplug (struct device dev, char *envp, int num_envp,	505	int pci_uevent(struct device dev, char *envp, int num_envp,
506	char *buffer, int buffer_size)	506	char *buffer, int buffer_size)
507	{	507	{
508	return -ENODEV;	508	return -ENODEV;
509	}	509	}
@@ -512,7 +512,7 @@ int pci_hotplug (struct device dev, char *envp, int num_envp,
512	struct bus_type pci_bus_type = {	512	struct bus_type pci_bus_type = {
513	.name = "pci",	513	.name = "pci",
514	.match = pci_bus_match,	514	.match = pci_bus_match,
515	.hotplug = pci_hotplug,	515	.uevent = pci_uevent,
516	.suspend = pci_device_suspend,	516	.suspend = pci_device_suspend,
517	.resume = pci_device_resume,	517	.resume = pci_device_resume,
518	.dev_attrs = pci_dev_attrs,	518	.dev_attrs = pci_dev_attrs,


diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 6527b36c9a6..294849d2459 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h
@@ -1,7 +1,7 @@
1	/* Functions internal to the PCI core code */	1	/* Functions internal to the PCI core code */
2		2
3	extern int pci_hotplug (struct device dev, char *envp, int num_envp,	3	extern int pci_uevent(struct device dev, char *envp, int num_envp,
4	char *buffer, int buffer_size);	4	char *buffer, int buffer_size);
5	extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);	5	extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
6	extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);	6	extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
7	extern void pci_cleanup_rom(struct pci_dev *dev);	7	extern void pci_cleanup_rom(struct pci_dev *dev);