* [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE @ 2018-12-01 15:52 Yangtao Li 2018-12-03 19:09 ` Andy Shevchenko 0 siblings, 1 reply; 12+ messages in thread From: Yangtao Li @ 2018-12-01 15:52 UTC (permalink / raw) To: rajneesh.bhardwaj, vishwanath.somayaji, dvhart, andy, david.e.box Cc: platform-driver-x86, linux-kernel, Yangtao Li Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> --- drivers/platform/x86/intel_pmc_core.c | 46 ++++--------------- .../platform/x86/intel_telemetry_debugfs.c | 42 +++-------------- 2 files changed, 14 insertions(+), 74 deletions(-) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 6b31d410cb09..95311ad6ec6f 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -311,7 +311,7 @@ static void pmc_core_display_map(struct seq_file *s, int index, pf_map[index].bit_mask & pf_reg ? "Off" : "On"); } -static int pmc_core_ppfear_sts_show(struct seq_file *s, void *unused) +static int pmc_core_ppfear_show(struct seq_file *s, void *unused) { struct pmc_dev *pmcdev = s->private; const struct pmc_bit_map *map = pmcdev->map->pfear_sts; @@ -330,17 +330,7 @@ static int pmc_core_ppfear_sts_show(struct seq_file *s, void *unused) return 0; } -static int pmc_core_ppfear_sts_open(struct inode *inode, struct file *file) -{ - return single_open(file, pmc_core_ppfear_sts_show, inode->i_private); -} - -static const struct file_operations pmc_core_ppfear_ops = { - .open = pmc_core_ppfear_sts_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(pmc_core_ppfear); /* This function should return link status, 0 means ready */ static int pmc_core_mtpmc_link_status(void) @@ -372,7 +362,7 @@ static int pmc_core_send_msg(u32 *addr_xram) return 0; } -static int pmc_core_mphy_pg_sts_show(struct seq_file *s, void *unused) +static int pmc_core_mphy_pg_show(struct seq_file *s, void *unused) { struct pmc_dev *pmcdev = s->private; const struct pmc_bit_map *map = pmcdev->map->mphy_sts; @@ -425,17 +415,7 @@ static int pmc_core_mphy_pg_sts_show(struct seq_file *s, void *unused) return err; } -static int pmc_core_mphy_pg_sts_open(struct inode *inode, struct file *file) -{ - return single_open(file, pmc_core_mphy_pg_sts_show, inode->i_private); -} - -static const struct file_operations pmc_core_mphy_pg_ops = { - .open = pmc_core_mphy_pg_sts_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(pmc_core_mphy_pg); static int pmc_core_pll_show(struct seq_file *s, void *unused) { @@ -472,17 +452,7 @@ static int pmc_core_pll_show(struct seq_file *s, void *unused) return err; } -static int pmc_core_pll_open(struct inode *inode, struct file *file) -{ - return single_open(file, pmc_core_pll_show, inode->i_private); -} - -static const struct file_operations pmc_core_pll_ops = { - .open = pmc_core_pll_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(pmc_core_pll); static ssize_t pmc_core_ltr_ignore_write(struct file *file, const char __user *userbuf, size_t count, loff_t *ppos) @@ -602,19 +572,19 @@ static int pmc_core_dbgfs_register(struct pmc_dev *pmcdev) &pmc_core_dev_state); debugfs_create_file("pch_ip_power_gating_status", 0444, dir, pmcdev, - &pmc_core_ppfear_ops); + &pmc_core_ppfear_fops); debugfs_create_file("ltr_ignore", 0644, dir, pmcdev, &pmc_core_ltr_ignore_ops); if (pmcdev->map->pll_sts) debugfs_create_file("pll_status", 0444, dir, pmcdev, - &pmc_core_pll_ops); + &pmc_core_pll_fops); if (pmcdev->map->mphy_sts) debugfs_create_file("mphy_core_lanes_power_gating_status", 0444, dir, pmcdev, - &pmc_core_mphy_pg_ops); + &pmc_core_mphy_pg_fops); if (pmcdev->map->slps0_dbg_maps) { debugfs_create_file("slp_s0_debug_status", 0444, diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index 40bce560eb30..98ba9185a27b 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c @@ -466,17 +466,7 @@ static int telem_pss_states_show(struct seq_file *s, void *unused) return 0; } -static int telem_pss_state_open(struct inode *inode, struct file *file) -{ - return single_open(file, telem_pss_states_show, inode->i_private); -} - -static const struct file_operations telem_pss_ops = { - .open = telem_pss_state_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(telem_pss_states); static int telem_ioss_states_show(struct seq_file *s, void *unused) { @@ -505,17 +495,7 @@ static int telem_ioss_states_show(struct seq_file *s, void *unused) return 0; } -static int telem_ioss_state_open(struct inode *inode, struct file *file) -{ - return single_open(file, telem_ioss_states_show, inode->i_private); -} - -static const struct file_operations telem_ioss_ops = { - .open = telem_ioss_state_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(telem_ioss_states); static int telem_soc_states_show(struct seq_file *s, void *unused) { @@ -664,17 +644,7 @@ static int telem_soc_states_show(struct seq_file *s, void *unused) return 0; } -static int telem_soc_state_open(struct inode *inode, struct file *file) -{ - return single_open(file, telem_soc_states_show, inode->i_private); -} - -static const struct file_operations telem_socstate_ops = { - .open = telem_soc_state_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(telem_soc_states); static int telem_s0ix_res_get(void *data, u64 *val) { @@ -960,7 +930,7 @@ static int __init telemetry_debugfs_init(void) f = debugfs_create_file("pss_info", S_IFREG | S_IRUGO, debugfs_conf->telemetry_dbg_dir, NULL, - &telem_pss_ops); + &telem_pss_states_fops); if (!f) { pr_err("pss_sample_info debugfs register failed\n"); goto out; @@ -968,7 +938,7 @@ static int __init telemetry_debugfs_init(void) f = debugfs_create_file("ioss_info", S_IFREG | S_IRUGO, debugfs_conf->telemetry_dbg_dir, NULL, - &telem_ioss_ops); + &telem_ioss_states_fops); if (!f) { pr_err("ioss_sample_info debugfs register failed\n"); goto out; @@ -976,7 +946,7 @@ static int __init telemetry_debugfs_init(void) f = debugfs_create_file("soc_states", S_IFREG | S_IRUGO, debugfs_conf->telemetry_dbg_dir, - NULL, &telem_socstate_ops); + NULL, &telem_soc_states_fops); if (!f) { pr_err("ioss_sample_info debugfs register failed\n"); goto out; -- 2.17.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-01 15:52 [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE Yangtao Li @ 2018-12-03 19:09 ` Andy Shevchenko 2018-12-04 3:59 ` Frank Lee 0 siblings, 1 reply; 12+ messages in thread From: Andy Shevchenko @ 2018-12-03 19:09 UTC (permalink / raw) To: tiny.windzz Cc: Rajneesh Bhardwaj, Vishwanath Somayaji, Darren Hart, Andy Shevchenko, David Box, Platform Driver, Linux Kernel Mailing List On Sat, Dec 1, 2018 at 5:52 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. By some reason it's not applicable. Please, rebase on top of our for-next branch, thanks! > > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> > --- > drivers/platform/x86/intel_pmc_core.c | 46 ++++--------------- > .../platform/x86/intel_telemetry_debugfs.c | 42 +++-------------- > 2 files changed, 14 insertions(+), 74 deletions(-) > > diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c > index 6b31d410cb09..95311ad6ec6f 100644 > --- a/drivers/platform/x86/intel_pmc_core.c > +++ b/drivers/platform/x86/intel_pmc_core.c > @@ -311,7 +311,7 @@ static void pmc_core_display_map(struct seq_file *s, int index, > pf_map[index].bit_mask & pf_reg ? "Off" : "On"); > } > > -static int pmc_core_ppfear_sts_show(struct seq_file *s, void *unused) > +static int pmc_core_ppfear_show(struct seq_file *s, void *unused) > { > struct pmc_dev *pmcdev = s->private; > const struct pmc_bit_map *map = pmcdev->map->pfear_sts; > @@ -330,17 +330,7 @@ static int pmc_core_ppfear_sts_show(struct seq_file *s, void *unused) > return 0; > } > > -static int pmc_core_ppfear_sts_open(struct inode *inode, struct file *file) > -{ > - return single_open(file, pmc_core_ppfear_sts_show, inode->i_private); > -} > - > -static const struct file_operations pmc_core_ppfear_ops = { > - .open = pmc_core_ppfear_sts_open, > - .read = seq_read, > - .llseek = seq_lseek, > - .release = single_release, > -}; > +DEFINE_SHOW_ATTRIBUTE(pmc_core_ppfear); > > /* This function should return link status, 0 means ready */ > static int pmc_core_mtpmc_link_status(void) > @@ -372,7 +362,7 @@ static int pmc_core_send_msg(u32 *addr_xram) > return 0; > } > > -static int pmc_core_mphy_pg_sts_show(struct seq_file *s, void *unused) > +static int pmc_core_mphy_pg_show(struct seq_file *s, void *unused) > { > struct pmc_dev *pmcdev = s->private; > const struct pmc_bit_map *map = pmcdev->map->mphy_sts; > @@ -425,17 +415,7 @@ static int pmc_core_mphy_pg_sts_show(struct seq_file *s, void *unused) > return err; > } > > -static int pmc_core_mphy_pg_sts_open(struct inode *inode, struct file *file) > -{ > - return single_open(file, pmc_core_mphy_pg_sts_show, inode->i_private); > -} > - > -static const struct file_operations pmc_core_mphy_pg_ops = { > - .open = pmc_core_mphy_pg_sts_open, > - .read = seq_read, > - .llseek = seq_lseek, > - .release = single_release, > -}; > +DEFINE_SHOW_ATTRIBUTE(pmc_core_mphy_pg); > > static int pmc_core_pll_show(struct seq_file *s, void *unused) > { > @@ -472,17 +452,7 @@ static int pmc_core_pll_show(struct seq_file *s, void *unused) > return err; > } > > -static int pmc_core_pll_open(struct inode *inode, struct file *file) > -{ > - return single_open(file, pmc_core_pll_show, inode->i_private); > -} > - > -static const struct file_operations pmc_core_pll_ops = { > - .open = pmc_core_pll_open, > - .read = seq_read, > - .llseek = seq_lseek, > - .release = single_release, > -}; > +DEFINE_SHOW_ATTRIBUTE(pmc_core_pll); > > static ssize_t pmc_core_ltr_ignore_write(struct file *file, const char __user > *userbuf, size_t count, loff_t *ppos) > @@ -602,19 +572,19 @@ static int pmc_core_dbgfs_register(struct pmc_dev *pmcdev) > &pmc_core_dev_state); > > debugfs_create_file("pch_ip_power_gating_status", 0444, dir, pmcdev, > - &pmc_core_ppfear_ops); > + &pmc_core_ppfear_fops); > > debugfs_create_file("ltr_ignore", 0644, dir, pmcdev, > &pmc_core_ltr_ignore_ops); > > if (pmcdev->map->pll_sts) > debugfs_create_file("pll_status", 0444, dir, pmcdev, > - &pmc_core_pll_ops); > + &pmc_core_pll_fops); > > if (pmcdev->map->mphy_sts) > debugfs_create_file("mphy_core_lanes_power_gating_status", > 0444, dir, pmcdev, > - &pmc_core_mphy_pg_ops); > + &pmc_core_mphy_pg_fops); > > if (pmcdev->map->slps0_dbg_maps) { > debugfs_create_file("slp_s0_debug_status", 0444, > diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c > index 40bce560eb30..98ba9185a27b 100644 > --- a/drivers/platform/x86/intel_telemetry_debugfs.c > +++ b/drivers/platform/x86/intel_telemetry_debugfs.c > @@ -466,17 +466,7 @@ static int telem_pss_states_show(struct seq_file *s, void *unused) > return 0; > } > > -static int telem_pss_state_open(struct inode *inode, struct file *file) > -{ > - return single_open(file, telem_pss_states_show, inode->i_private); > -} > - > -static const struct file_operations telem_pss_ops = { > - .open = telem_pss_state_open, > - .read = seq_read, > - .llseek = seq_lseek, > - .release = single_release, > -}; > +DEFINE_SHOW_ATTRIBUTE(telem_pss_states); > > static int telem_ioss_states_show(struct seq_file *s, void *unused) > { > @@ -505,17 +495,7 @@ static int telem_ioss_states_show(struct seq_file *s, void *unused) > return 0; > } > > -static int telem_ioss_state_open(struct inode *inode, struct file *file) > -{ > - return single_open(file, telem_ioss_states_show, inode->i_private); > -} > - > -static const struct file_operations telem_ioss_ops = { > - .open = telem_ioss_state_open, > - .read = seq_read, > - .llseek = seq_lseek, > - .release = single_release, > -}; > +DEFINE_SHOW_ATTRIBUTE(telem_ioss_states); > > static int telem_soc_states_show(struct seq_file *s, void *unused) > { > @@ -664,17 +644,7 @@ static int telem_soc_states_show(struct seq_file *s, void *unused) > return 0; > } > > -static int telem_soc_state_open(struct inode *inode, struct file *file) > -{ > - return single_open(file, telem_soc_states_show, inode->i_private); > -} > - > -static const struct file_operations telem_socstate_ops = { > - .open = telem_soc_state_open, > - .read = seq_read, > - .llseek = seq_lseek, > - .release = single_release, > -}; > +DEFINE_SHOW_ATTRIBUTE(telem_soc_states); > > static int telem_s0ix_res_get(void *data, u64 *val) > { > @@ -960,7 +930,7 @@ static int __init telemetry_debugfs_init(void) > > f = debugfs_create_file("pss_info", S_IFREG | S_IRUGO, > debugfs_conf->telemetry_dbg_dir, NULL, > - &telem_pss_ops); > + &telem_pss_states_fops); > if (!f) { > pr_err("pss_sample_info debugfs register failed\n"); > goto out; > @@ -968,7 +938,7 @@ static int __init telemetry_debugfs_init(void) > > f = debugfs_create_file("ioss_info", S_IFREG | S_IRUGO, > debugfs_conf->telemetry_dbg_dir, NULL, > - &telem_ioss_ops); > + &telem_ioss_states_fops); > if (!f) { > pr_err("ioss_sample_info debugfs register failed\n"); > goto out; > @@ -976,7 +946,7 @@ static int __init telemetry_debugfs_init(void) > > f = debugfs_create_file("soc_states", S_IFREG | S_IRUGO, > debugfs_conf->telemetry_dbg_dir, > - NULL, &telem_socstate_ops); > + NULL, &telem_soc_states_fops); > if (!f) { > pr_err("ioss_sample_info debugfs register failed\n"); > goto out; > -- > 2.17.0 > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-03 19:09 ` Andy Shevchenko @ 2018-12-04 3:59 ` Frank Lee 2018-12-04 12:40 ` Andy Shevchenko 0 siblings, 1 reply; 12+ messages in thread From: Frank Lee @ 2018-12-04 3:59 UTC (permalink / raw) To: andy.shevchenko Cc: rajneesh.bhardwaj, vishwanath.somayaji, dvhart, andy, David Box, platform-driver-x86, linux-kernel On Tue, Dec 4, 2018 at 3:09 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Sat, Dec 1, 2018 at 5:52 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. > > By some reason it's not applicable. > Please, rebase on top of our for-next branch, thanks! For what reason? I thought that for-next branch has not changed much. Yours, Yangtao ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-04 3:59 ` Frank Lee @ 2018-12-04 12:40 ` Andy Shevchenko 2018-12-04 15:30 ` Frank Lee 0 siblings, 1 reply; 12+ messages in thread From: Andy Shevchenko @ 2018-12-04 12:40 UTC (permalink / raw) To: tiny.windzz Cc: Rajneesh Bhardwaj, Vishwanath Somayaji, Darren Hart, Andy Shevchenko, David Box, Platform Driver, Linux Kernel Mailing List On Tue, Dec 4, 2018 at 5:59 AM Frank Lee <tiny.windzz@gmail.com> wrote: > > On Tue, Dec 4, 2018 at 3:09 AM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > > > On Sat, Dec 1, 2018 at 5:52 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > > > > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. > > I like your patch, but... > > By some reason it's not applicable. > > Please, rebase on top of our for-next branch, thanks! > For what reason? ...because I can't apply it, it fails with conflicts. > I thought that for-next branch has not changed much. That's correct, it's updated only by approved patch series which is not many _this_ cycle. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-04 12:40 ` Andy Shevchenko @ 2018-12-04 15:30 ` Frank Lee 2018-12-04 16:18 ` Andy Shevchenko 0 siblings, 1 reply; 12+ messages in thread From: Frank Lee @ 2018-12-04 15:30 UTC (permalink / raw) To: Andy Shevchenko Cc: rajneesh.bhardwaj, vishwanath.somayaji, dvhart, andy, David Box, platform-driver-x86, linux-kernel On Tue, Dec 4, 2018 at 8:40 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Tue, Dec 4, 2018 at 5:59 AM Frank Lee <tiny.windzz@gmail.com> wrote: > > > > On Tue, Dec 4, 2018 at 3:09 AM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > > > > > On Sat, Dec 1, 2018 at 5:52 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > > > > > > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. > > > > > I like your patch, but... > > > > By some reason it's not applicable. > > > Please, rebase on top of our for-next branch, thanks! > > > For what reason? > > ...because I can't apply it, it fails with conflicts. > > > I thought that for-next branch has not changed much. > > That's correct, it's updated only by approved patch series which is > not many _this_ cycle. I am confused about what you said. Because I pulled your .git down, there is no conflicts when apply it....... MBR, Yangtao > > -- > With Best Regards, > Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-04 15:30 ` Frank Lee @ 2018-12-04 16:18 ` Andy Shevchenko 2018-12-04 16:58 ` Frank Lee 0 siblings, 1 reply; 12+ messages in thread From: Andy Shevchenko @ 2018-12-04 16:18 UTC (permalink / raw) To: tiny.windzz Cc: Rajneesh Bhardwaj, Vishwanath Somayaji, Darren Hart, Andy Shevchenko, David Box, Platform Driver, Linux Kernel Mailing List On Tue, Dec 4, 2018 at 5:30 PM Frank Lee <tiny.windzz@gmail.com> wrote: > On Tue, Dec 4, 2018 at 8:40 PM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > On Tue, Dec 4, 2018 at 5:59 AM Frank Lee <tiny.windzz@gmail.com> wrote: > > > On Tue, Dec 4, 2018 at 3:09 AM Andy Shevchenko > > > <andy.shevchenko@gmail.com> wrote: > > > > On Sat, Dec 1, 2018 at 5:52 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > > > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. > > I like your patch, but... > > > > > > By some reason it's not applicable. > > > > Please, rebase on top of our for-next branch, thanks! > > > > > For what reason? > > > > ...because I can't apply it, it fails with conflicts. > > > > > I thought that for-next branch has not changed much. > > > > That's correct, it's updated only by approved patch series which is > > not many _this_ cycle. > I am confused about what you said. > Because I pulled your .git down, there is no conflicts when apply it....... linux(for-next) $ git pw patch apply 10707735 -s error: patch failed: drivers/platform/x86/intel_pmc_core.c:602 error: drivers/platform/x86/intel_pmc_core.c: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch Applying: platform/x86: convert to DEFINE_SHOW_ATTRIBUTE Patch failed at 0001 platform/x86: convert to DEFINE_SHOW_ATTRIBUTE When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-04 16:18 ` Andy Shevchenko @ 2018-12-04 16:58 ` Frank Lee 2018-12-04 17:39 ` Andy Shevchenko 0 siblings, 1 reply; 12+ messages in thread From: Frank Lee @ 2018-12-04 16:58 UTC (permalink / raw) To: Andy Shevchenko Cc: rajneesh.bhardwaj, vishwanath.somayaji, dvhart, andy, David Box, platform-driver-x86, linux-kernel On Wed, Dec 5, 2018 at 12:18 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Tue, Dec 4, 2018 at 5:30 PM Frank Lee <tiny.windzz@gmail.com> wrote: > > On Tue, Dec 4, 2018 at 8:40 PM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > > On Tue, Dec 4, 2018 at 5:59 AM Frank Lee <tiny.windzz@gmail.com> wrote: > > > > On Tue, Dec 4, 2018 at 3:09 AM Andy Shevchenko > > > > <andy.shevchenko@gmail.com> wrote: > > > > > On Sat, Dec 1, 2018 at 5:52 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > > > > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. > > > > I like your patch, but... > > > > > > > > By some reason it's not applicable. > > > > > Please, rebase on top of our for-next branch, thanks! > > > > > > > For what reason? > > > > > > ...because I can't apply it, it fails with conflicts. > > > > > > > I thought that for-next branch has not changed much. > > > > > > That's correct, it's updated only by approved patch series which is > > > not many _this_ cycle. > > I am confused about what you said. > > Because I pulled your .git down, there is no conflicts when apply it....... > > linux(for-next) > $ git pw patch apply 10707735 -s > error: patch failed: drivers/platform/x86/intel_pmc_core.c:602 > error: drivers/platform/x86/intel_pmc_core.c: patch does not apply > hint: Use 'git am --show-current-patch' to see the failed patch > Applying: platform/x86: convert to DEFINE_SHOW_ATTRIBUTE > Patch failed at 0001 platform/x86: convert to DEFINE_SHOW_ATTRIBUTE > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". $ git br -r origin/HEAD -> origin/master origin/fixes origin/for-next origin/master origin/review-andy $ git remote set-branches --add origin for-next $ git br -vv * for-next 651022382c7f [origin/for-next] Linux 4.20-rc1 $ git apply ../../0001-platform-x86-convert-to-DEFINE_SHOW_ATTRIBUTE.patch $ git st On branch for-next Your branch is up to date with 'origin/for-next'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: drivers/platform/x86/intel_pmc_core.c modified: drivers/platform/x86/intel_telemetry_debugfs.c no changes added to commit (use "git add" and/or "git commit -a") Andy,I don't know why. Is there a problem with my operation? Thanks, Yangtao > > -- > With Best Regards, > Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-04 16:58 ` Frank Lee @ 2018-12-04 17:39 ` Andy Shevchenko 2018-12-05 1:47 ` Frank Lee 0 siblings, 1 reply; 12+ messages in thread From: Andy Shevchenko @ 2018-12-04 17:39 UTC (permalink / raw) To: tiny.windzz Cc: Rajneesh Bhardwaj, Vishwanath Somayaji, Darren Hart, Andy Shevchenko, David Box, Platform Driver, Linux Kernel Mailing List On Tue, Dec 4, 2018 at 6:58 PM Frank Lee <tiny.windzz@gmail.com> wrote: > $ git br -r > origin/HEAD -> origin/master > origin/fixes > origin/for-next > origin/master > origin/review-andy > $ git remote set-branches --add origin for-next > $ git br -vv > * for-next 651022382c7f [origin/for-next] Linux 4.20-rc1 Here is the problem, For a few days at least we have 4ecd94b8e13b (HEAD -> for-next) platform/x86: dell-laptop: Mark expected switch fall-throughs > $ git apply ../../0001-platform-x86-convert-to-DEFINE_SHOW_ATTRIBUTE.patch > $ git st > On branch for-next > Your branch is up to date with 'origin/for-next'. > > Changes not staged for commit: > (use "git add <file>..." to update what will be committed) > (use "git checkout -- <file>..." to discard changes in working directory) > > modified: drivers/platform/x86/intel_pmc_core.c > modified: drivers/platform/x86/intel_telemetry_debugfs.c > > no changes added to commit (use "git add" and/or "git commit -a") > Andy,I don't know why. > Is there a problem with my operation? Definitely. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-04 17:39 ` Andy Shevchenko @ 2018-12-05 1:47 ` Frank Lee 2018-12-05 8:42 ` Andy Shevchenko 0 siblings, 1 reply; 12+ messages in thread From: Frank Lee @ 2018-12-05 1:47 UTC (permalink / raw) To: Andy Shevchenko Cc: rajneesh.bhardwaj, vishwanath.somayaji, dvhart, andy, David Box, platform-driver-x86, linux-kernel On Wed, Dec 5, 2018 at 1:39 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Tue, Dec 4, 2018 at 6:58 PM Frank Lee <tiny.windzz@gmail.com> wrote: > > > $ git br -r > > origin/HEAD -> origin/master > > origin/fixes > > origin/for-next > > origin/master > > origin/review-andy > > $ git remote set-branches --add origin for-next > > $ git br -vv > > * for-next 651022382c7f [origin/for-next] Linux 4.20-rc1 > > Here is the problem, > > For a few days at least we have > 4ecd94b8e13b (HEAD -> for-next) platform/x86: dell-laptop: Mark > expected switch fall-throughs > > > $ git apply ../../0001-platform-x86-convert-to-DEFINE_SHOW_ATTRIBUTE.patch > > $ git st > > On branch for-next > > Your branch is up to date with 'origin/for-next'. > > > > Changes not staged for commit: > > (use "git add <file>..." to update what will be committed) > > (use "git checkout -- <file>..." to discard changes in working directory) > > > > modified: drivers/platform/x86/intel_pmc_core.c > > modified: drivers/platform/x86/intel_telemetry_debugfs.c > > > > no changes added to commit (use "git add" and/or "git commit -a") > > > Andy,I don't know why. > > Is there a problem with my operation? > > Definitely. Where can I find the correct git repository? I haven't found the correct one for a long time, which include the commit(4ecd94b8e13b ) you said. MBR, Yangtao > > -- > With Best Regards, > Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-05 1:47 ` Frank Lee @ 2018-12-05 8:42 ` Andy Shevchenko 2018-12-05 8:45 ` Rajneesh Bhardwaj 0 siblings, 1 reply; 12+ messages in thread From: Andy Shevchenko @ 2018-12-05 8:42 UTC (permalink / raw) To: tiny.windzz Cc: Rajneesh Bhardwaj, Vishwanath Somayaji, Darren Hart, Andy Shevchenko, David Box, Platform Driver, Linux Kernel Mailing List On Wed, Dec 5, 2018 at 3:47 AM Frank Lee <tiny.windzz@gmail.com> wrote: > On Wed, Dec 5, 2018 at 1:39 AM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > On Tue, Dec 4, 2018 at 6:58 PM Frank Lee <tiny.windzz@gmail.com> wrote: > > > $ git remote set-branches --add origin for-next > > > $ git br -vv > > > * for-next 651022382c7f [origin/for-next] Linux 4.20-rc1 > > > > Here is the problem, > > > > For a few days at least we have > > 4ecd94b8e13b (HEAD -> for-next) platform/x86: dell-laptop: Mark > > expected switch fall-throughs > Where can I find the correct git repository? I think even old address still exists: http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git > I haven't found the correct one for a long time, > which include the commit(4ecd94b8e13b ) you said. And newest one is available via http://git.infradead.org/linux-platform-drivers-x86.git http://git.infradead.org/linux-platform-drivers-x86.git/commit/4ecd94b8e13b014a28be48c94f751fb62f7c749e Though it's already advanced to contain new portion of accepted patches (doesn't matter for you, because they don't touch file in question). -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-05 8:42 ` Andy Shevchenko @ 2018-12-05 8:45 ` Rajneesh Bhardwaj 2018-12-05 10:04 ` Andy Shevchenko 0 siblings, 1 reply; 12+ messages in thread From: Rajneesh Bhardwaj @ 2018-12-05 8:45 UTC (permalink / raw) To: Andy Shevchenko Cc: tiny.windzz, Vishwanath Somayaji, Darren Hart, Andy Shevchenko, David Box, Platform Driver, Linux Kernel Mailing List On Wed, Dec 05, 2018 at 10:42:21AM +0200, Andy Shevchenko wrote: > On Wed, Dec 5, 2018 at 3:47 AM Frank Lee <tiny.windzz@gmail.com> wrote: > > On Wed, Dec 5, 2018 at 1:39 AM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > > On Tue, Dec 4, 2018 at 6:58 PM Frank Lee <tiny.windzz@gmail.com> wrote: > > > > > $ git remote set-branches --add origin for-next > > > > $ git br -vv > > > > * for-next 651022382c7f [origin/for-next] Linux 4.20-rc1 > > > > > > Here is the problem, > > > > > > For a few days at least we have > > > 4ecd94b8e13b (HEAD -> for-next) platform/x86: dell-laptop: Mark > > > expected switch fall-throughs > > > Where can I find the correct git repository? > > I think even old address still exists: > http://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git > > > I haven't found the correct one for a long time, > > which include the commit(4ecd94b8e13b ) you said. > > And newest one is available via > http://git.infradead.org/linux-platform-drivers-x86.git > > http://git.infradead.org/linux-platform-drivers-x86.git/commit/4ecd94b8e13b014a28be48c94f751fb62f7c749e > > Though it's already advanced to contain new portion of accepted > patches (doesn't matter for you, because they don't touch file in > question). Hi Andy, i was thinking of having it split into two patches as it touches two unrelated files. What is your opinion? Functionality wise, it looks good to me. > > > > -- > With Best Regards, > Andy Shevchenko -- Best Regards, Rajneesh ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE 2018-12-05 8:45 ` Rajneesh Bhardwaj @ 2018-12-05 10:04 ` Andy Shevchenko 0 siblings, 0 replies; 12+ messages in thread From: Andy Shevchenko @ 2018-12-05 10:04 UTC (permalink / raw) To: Rajneesh Bhardwaj Cc: tiny.windzz, Vishwanath Somayaji, Darren Hart, Andy Shevchenko, David Box, Platform Driver, Linux Kernel Mailing List On Wed, Dec 5, 2018 at 10:56 AM Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com> wrote: > Hi Andy, i was thinking of having it split into two patches as it touches > two unrelated files. What is your opinion? If it is the case, I agree with you. Since patch didn't applied clearly I even had no chance to look at it closer. > Functionality wise, it looks good to me. Thanks. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-12-05 10:04 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-12-01 15:52 [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE Yangtao Li 2018-12-03 19:09 ` Andy Shevchenko 2018-12-04 3:59 ` Frank Lee 2018-12-04 12:40 ` Andy Shevchenko 2018-12-04 15:30 ` Frank Lee 2018-12-04 16:18 ` Andy Shevchenko 2018-12-04 16:58 ` Frank Lee 2018-12-04 17:39 ` Andy Shevchenko 2018-12-05 1:47 ` Frank Lee 2018-12-05 8:42 ` Andy Shevchenko 2018-12-05 8:45 ` Rajneesh Bhardwaj 2018-12-05 10:04 ` Andy Shevchenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox