On 2015/1/21 5:50, Andy Shevchenko wrote: > The change allows to use dev_printk() type of macros in the module functions.
The patch itself looks good to me, but not sure why do we need this change, will we use dev_prink in the subsequent patches? Thanks, -Aubrey > > Signed-off-by: Andy Shevchenko <[email protected]> > --- > 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); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
