diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2013-03-27 10:58:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 11:32:21 -0400 |
commit | c4d589be4405d475f7b529134debdf37f1ada957 (patch) | |
tree | 3e024208d41e464e3cbc1815ee8f26735c9c5115 /drivers/misc | |
parent | d0265f1202e82a27a015cb24635d85f3ab9ae4d5 (diff) |
mei: rename function mei_hw_init to mei_start
The hw initialization is now done as part of
hw specific code this makes the name mei_hw_init little misleading.
We rename it to mei_start in spirit of already existing
functions mei_stop and mei_reset.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mei/init.c | 4 | ||||
-rw-r--r-- | drivers/misc/mei/mei_dev.h | 2 | ||||
-rw-r--r-- | drivers/misc/mei/pci-me.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 33f56308ba3c..b3f7c3e761a0 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c | |||
@@ -69,13 +69,13 @@ void mei_device_init(struct mei_device *dev) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | /** | 71 | /** |
72 | * mei_hw_init - initializes host and fw to start work. | 72 | * mei_start - initializes host and fw to start work. |
73 | * | 73 | * |
74 | * @dev: the device structure | 74 | * @dev: the device structure |
75 | * | 75 | * |
76 | * returns 0 on success, <0 on failure. | 76 | * returns 0 on success, <0 on failure. |
77 | */ | 77 | */ |
78 | int mei_hw_init(struct mei_device *dev) | 78 | int mei_start(struct mei_device *dev) |
79 | { | 79 | { |
80 | int ret = 0; | 80 | int ret = 0; |
81 | 81 | ||
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 091f50af18a4..b5d66076de3d 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h | |||
@@ -393,7 +393,7 @@ static inline u32 mei_data2slots(size_t length) | |||
393 | */ | 393 | */ |
394 | void mei_device_init(struct mei_device *dev); | 394 | void mei_device_init(struct mei_device *dev); |
395 | void mei_reset(struct mei_device *dev, int interrupts); | 395 | void mei_reset(struct mei_device *dev, int interrupts); |
396 | int mei_hw_init(struct mei_device *dev); | 396 | int mei_start(struct mei_device *dev); |
397 | void mei_stop(struct mei_device *dev); | 397 | void mei_stop(struct mei_device *dev); |
398 | 398 | ||
399 | /* | 399 | /* |
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 252b1fd315a8..985afd062adb 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c | |||
@@ -184,7 +184,7 @@ static int mei_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
184 | goto disable_msi; | 184 | goto disable_msi; |
185 | } | 185 | } |
186 | 186 | ||
187 | if (mei_hw_init(dev)) { | 187 | if (mei_start(dev)) { |
188 | dev_err(&pdev->dev, "init hw failure.\n"); | 188 | dev_err(&pdev->dev, "init hw failure.\n"); |
189 | err = -ENODEV; | 189 | err = -ENODEV; |
190 | goto release_irq; | 190 | goto release_irq; |