| Message ID | 20181106110434.49221-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v1,01/15] pinctrl: cedarfork: Get rid of unneeded ->probe() stub | expand |
On Tue, Nov 06, 2018 at 01:04:20PM +0200, Andy Shevchenko wrote: > static const struct acpi_device_id cdf_pinctrl_acpi_match[] = { > - { "INTC3001" }, > - { } > + { "INTC3001", (kernel_ulong_t)&cdf_soc_data }, > + {} This is unrelated change and I prefer it to be { } instead of {}. Ditto for the rest of the patches. Thanks :)
On Tue, Nov 06, 2018 at 03:47:08PM +0200, Mika Westerberg wrote: > On Tue, Nov 06, 2018 at 01:04:20PM +0200, Andy Shevchenko wrote: > > static const struct acpi_device_id cdf_pinctrl_acpi_match[] = { > > - { "INTC3001" }, > > - { } > > + { "INTC3001", (kernel_ulong_t)&cdf_soc_data }, > > + {} > > This is unrelated change and I prefer it to be { } instead of {}. Ditto > for the rest of the patches. One style vs. the other. So, I have no objection to keep your style. Will change accordingly.
On Tue, Nov 6, 2018 at 12:04 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > The local ->probe() stub does nothing except calling > a generic Intel pin control probe function. Thus, > it's not needed and generic function may be called directly. > > Convert the driver accordingly. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> The series: Acked-by: Linus Walleij <linus.walleij@linaro.org> I expect to get this via pull request from the Intel pinctrl git tree :) Yours, Linus Walleij
On Thu, Nov 15, 2018 at 10:57:41AM +0100, Linus Walleij wrote: > On Tue, Nov 6, 2018 at 12:04 PM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > > The local ->probe() stub does nothing except calling > > a generic Intel pin control probe function. Thus, > > it's not needed and generic function may be called directly. > > > > Convert the driver accordingly. > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > The series: > Acked-by: Linus Walleij <linus.walleij@linaro.org> Thanks, currently we have it already there without your Ack (we consider our for-next branch "published"). Do you want me to rebase with your tag? > I expect to get this via pull request from the Intel pinctrl > git tree :) Yes, this is the plan!
On Thu, Nov 15, 2018 at 11:19 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > On Thu, Nov 15, 2018 at 10:57:41AM +0100, Linus Walleij wrote: > > On Tue, Nov 6, 2018 at 12:04 PM Andy Shevchenko > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > The local ->probe() stub does nothing except calling > > > a generic Intel pin control probe function. Thus, > > > it's not needed and generic function may be called directly. > > > > > > Convert the driver accordingly. > > > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > > The series: > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Thanks, currently we have it already there without your Ack (we consider our > for-next branch "published"). Do you want me to rebase with your tag? No, who cares. > > I expect to get this via pull request from the Intel pinctrl > > git tree :) > > Yes, this is the plan! Great, looking forward to it! Yours, Linus Walleij
diff --git a/drivers/pinctrl/intel/pinctrl-cedarfork.c b/drivers/pinctrl/intel/pinctrl-cedarfork.c index 7e068fc61ce1..a125c02a61b8 100644 --- a/drivers/pinctrl/intel/pinctrl-cedarfork.c +++ b/drivers/pinctrl/intel/pinctrl-cedarfork.c @@ -330,21 +330,16 @@ static const struct intel_pinctrl_soc_data cdf_soc_data = { .ncommunities = ARRAY_SIZE(cdf_communities), }; -static int cdf_pinctrl_probe(struct platform_device *pdev) -{ - return intel_pinctrl_probe(pdev, &cdf_soc_data); -} - static INTEL_PINCTRL_PM_OPS(cdf_pinctrl_pm_ops); static const struct acpi_device_id cdf_pinctrl_acpi_match[] = { - { "INTC3001" }, - { } + { "INTC3001", (kernel_ulong_t)&cdf_soc_data }, + {} }; MODULE_DEVICE_TABLE(acpi, cdf_pinctrl_acpi_match); static struct platform_driver cdf_pinctrl_driver = { - .probe = cdf_pinctrl_probe, + .probe = intel_pinctrl_probe_by_hid, .driver = { .name = "cedarfork-pinctrl", .acpi_match_table = cdf_pinctrl_acpi_match,
The local ->probe() stub does nothing except calling a generic Intel pin control probe function. Thus, it's not needed and generic function may be called directly. Convert the driver accordingly. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/intel/pinctrl-cedarfork.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)