lkml.org 
[lkml]   [2015]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 1/4] x86: pmc_atom: save struct device pointer in pmc
Date
The change allows to use dev_printk() type of macros in the module functions.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/kernel/pmc_atom.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
index d66a4fe..d338222 100644
--- a/arch/x86/kernel/pmc_atom.c
+++ b/arch/x86/kernel/pmc_atom.c
@@ -26,6 +26,7 @@
#include <asm/pmc_atom.h>

struct pmc_dev {
+ struct device *dev;
u32 base_addr;
void __iomem *regmap;
#ifdef CONFIG_DEBUG_FS
@@ -250,7 +251,7 @@ static void pmc_dbgfs_unregister(struct pmc_dev *pmc)
debugfs_remove_recursive(pmc->dbgfs_dir);
}

-static int pmc_dbgfs_register(struct pmc_dev *pmc, struct pci_dev *pdev)
+static int pmc_dbgfs_register(struct pmc_dev *pmc)
{
struct dentry *dir, *f;

@@ -263,21 +264,21 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc, struct pci_dev *pdev)
f = debugfs_create_file("dev_state", S_IFREG | S_IRUGO,
dir, pmc, &pmc_dev_state_ops);
if (!f) {
- dev_err(&pdev->dev, "dev_state register failed\n");
+ dev_err(pmc->dev, "dev_state register failed\n");
goto err;
}

f = debugfs_create_file("pss_state", S_IFREG | S_IRUGO,
dir, pmc, &pmc_pss_state_ops);
if (!f) {
- dev_err(&pdev->dev, "pss_state register failed\n");
+ dev_err(pmc->dev, "pss_state register failed\n");
goto err;
}

f = debugfs_create_file("sleep_state", S_IFREG | S_IRUGO,
dir, pmc, &pmc_sleep_tmr_ops);
if (!f) {
- dev_err(&pdev->dev, "sleep_state register failed\n");
+ dev_err(pmc->dev, "sleep_state register failed\n");
goto err;
}

@@ -287,7 +288,7 @@ err:
return -ENODEV;
}
#else
-static int pmc_dbgfs_register(struct pmc_dev *pmc, struct pci_dev *pdev)
+static int pmc_dbgfs_register(struct pmc_dev *pmc)
{
return 0;
}
@@ -315,10 +316,12 @@ static int pmc_setup_dev(struct pci_dev *pdev)
return -ENOMEM;
}

+ pmc->dev = &pdev->dev;
+
/* PMC hardware registers setup */
pmc_hw_reg_setup(pmc);

- ret = pmc_dbgfs_register(pmc, pdev);
+ ret = pmc_dbgfs_register(pmc);
if (ret) {
iounmap(pmc->regmap);
}
--
2.1.4


\
 
 \ /
  Last update: 2015-01-20 23:21    [W:0.136 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site