| Message ID | 1477467498-27145-1-git-send-email-cw00.choi@samsung.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On 2016-10-26 00:38, Chanwoo Choi wrote: > This patch uses the resource-managed to add the devfreq device. > This function will make it easy to handle the devfreq device. > > - struct devfreq *devm_devfreq_add_device(struct device *dev, > struct devfreq_dev_profile *profile, > const char *governor_name, > void *data); > Cc: Vinayak Holikatti <vinholikatti@gmail.com> > Cc: James E.J. Bottomley <jejb@linux.vnet.ibm.com> > Cc: Martin K. Petersen <martin.petersen@oracle.com> > Cc: linux-scsi@vger.kernel.org > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > --- > drivers/scsi/ufs/ufshcd.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index f08d41a2d70b..e639071fd3a1 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -6198,8 +6198,6 @@ void ufshcd_remove(struct ufs_hba *hba) > scsi_host_put(hba->host); > > ufshcd_exit_clk_gating(hba); > - if (ufshcd_is_clkscaling_enabled(hba)) > - devfreq_remove_device(hba->devfreq); > ufshcd_hba_exit(hba); > } > EXPORT_SYMBOL_GPL(ufshcd_remove); > @@ -6495,7 +6493,7 @@ int ufshcd_init(struct ufs_hba *hba, void > __iomem *mmio_base, unsigned int irq) > } > > if (ufshcd_is_clkscaling_enabled(hba)) { > - hba->devfreq = devfreq_add_device(dev, &ufs_devfreq_profile, > + hba->devfreq = devm_devfreq_add_device(dev, &ufs_devfreq_profile, > "simple_ondemand", NULL); > if (IS_ERR(hba->devfreq)) { > dev_err(hba->dev, "Unable to register with devfreq %ld\n", This change looks good to me but this will have merge conflicts if this gets in after my patch series " [PATCH v1 00/11] scsi: ufs: bug fixes patch series #1" (due to "[PATCH v1 06/11] scsi: ufs: suspend clock scaling for failed runtime_resume"). so if you can, please pull in my patch series and rebase your change on top of it and send it out again. Thanks, Subhash
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index f08d41a2d70b..e639071fd3a1 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6198,8 +6198,6 @@ void ufshcd_remove(struct ufs_hba *hba) scsi_host_put(hba->host); ufshcd_exit_clk_gating(hba); - if (ufshcd_is_clkscaling_enabled(hba)) - devfreq_remove_device(hba->devfreq); ufshcd_hba_exit(hba); } EXPORT_SYMBOL_GPL(ufshcd_remove); @@ -6495,7 +6493,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) } if (ufshcd_is_clkscaling_enabled(hba)) { - hba->devfreq = devfreq_add_device(dev, &ufs_devfreq_profile, + hba->devfreq = devm_devfreq_add_device(dev, &ufs_devfreq_profile, "simple_ondemand", NULL); if (IS_ERR(hba->devfreq)) { dev_err(hba->dev, "Unable to register with devfreq %ld\n",
This patch uses the resource-managed to add the devfreq device. This function will make it easy to handle the devfreq device. - struct devfreq *devm_devfreq_add_device(struct device *dev, struct devfreq_dev_profile *profile, const char *governor_name, void *data); Cc: Vinayak Holikatti <vinholikatti@gmail.com> Cc: James E.J. Bottomley <jejb@linux.vnet.ibm.com> Cc: Martin K. Petersen <martin.petersen@oracle.com> Cc: linux-scsi@vger.kernel.org Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> --- drivers/scsi/ufs/ufshcd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)