From c4d589be4405d475f7b529134debdf37f1ada957 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 27 Mar 2013 16:58:28 +0200 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mei/init.c | 4 ++-- drivers/misc/mei/mei_dev.h | 2 +- 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) } /** - * mei_hw_init - initializes host and fw to start work. + * mei_start - initializes host and fw to start work. * * @dev: the device structure * * returns 0 on success, <0 on failure. */ -int mei_hw_init(struct mei_device *dev) +int mei_start(struct mei_device *dev) { int ret = 0; 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) */ void mei_device_init(struct mei_device *dev); void mei_reset(struct mei_device *dev, int interrupts); -int mei_hw_init(struct mei_device *dev); +int mei_start(struct mei_device *dev); void mei_stop(struct mei_device *dev); /* 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) goto disable_msi; } - if (mei_hw_init(dev)) { + if (mei_start(dev)) { dev_err(&pdev->dev, "init hw failure.\n"); err = -ENODEV; goto release_irq; -- GitLab