| Message ID | 20190619172949.4522-20-mathieu.poirier@linaro.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 88a1607cbed371fa9853b0ebbbaadf9cd6f27ea3 |
| Headers | show |
| Series | coresight: next v5.2-rc5 | expand |
On Wed, Jun 19, 2019 at 11:29:23AM -0600, Mathieu Poirier wrote: > From: Suzuki K Poulose <suzuki.poulose@arm.com> > > Rename the of_coresight_alloc_memory() => coresight_alloc_conns() > as it is independent of the underlying firmware type. This is in > preparation for the ACPI support. > > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- > .../hwtracing/coresight/coresight-platform.c | 34 +++++++++++-------- > 1 file changed, 19 insertions(+), 15 deletions(-) This file is not in my tree. Did you forget to send me the commit: coresight: Rename of_coresight to coresight-platform ??? I applied all patches up to here, can you rebase and resend the remaining ones? thanks, greg k-h
On Wed, 19 Jun 2019 at 12:31, Greg KH <gregkh@linuxfoundation.org> wrote: > > On Wed, Jun 19, 2019 at 11:29:23AM -0600, Mathieu Poirier wrote: > > From: Suzuki K Poulose <suzuki.poulose@arm.com> > > > > Rename the of_coresight_alloc_memory() => coresight_alloc_conns() > > as it is independent of the underlying firmware type. This is in > > preparation for the ACPI support. > > > > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > --- > > .../hwtracing/coresight/coresight-platform.c | 34 +++++++++++-------- > > 1 file changed, 19 insertions(+), 15 deletions(-) > > This file is not in my tree. > > Did you forget to send me the commit: > coresight: Rename of_coresight to coresight-platform > ??? What ?!? > > I applied all patches up to here, can you rebase and resend the > remaining ones? Obviously something went wrong - let me look into it. Sorry for the mess and thanks for the patience. > > thanks, > > greg k-h
On Wed, 19 Jun 2019 at 12:31, Greg KH <gregkh@linuxfoundation.org> wrote: > > On Wed, Jun 19, 2019 at 11:29:23AM -0600, Mathieu Poirier wrote: > > From: Suzuki K Poulose <suzuki.poulose@arm.com> > > > > Rename the of_coresight_alloc_memory() => coresight_alloc_conns() > > as it is independent of the underlying firmware type. This is in > > preparation for the ACPI support. > > > > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > --- > > .../hwtracing/coresight/coresight-platform.c | 34 +++++++++++-------- > > 1 file changed, 19 insertions(+), 15 deletions(-) > > This file is not in my tree. > > Did you forget to send me the commit: > coresight: Rename of_coresight to coresight-platform > ??? > > I applied all patches up to here, can you rebase and resend the > remaining ones? I just sent you the rest, rebased on your char-misc-testing branch. I'm perplexed about the original set - git confirmed that it sent the patch: Result: 250 OK. Log says: Server: smtp.gmail.com MAIL FROM:<mathieu.poirier@linaro.org> RCPT TO:<gregkh@linuxfoundation.org> RCPT TO:<linux-arm-kernel@lists.infradead.org> From: Mathieu Poirier <mathieu.poirier@linaro.org> To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH 15/45] coresight: Rename of_coresight to coresight-platform Date: Wed, 19 Jun 2019 11:29:19 -0600 Message-Id: <20190619172949.4522-16-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190619172949.4522-1-mathieu.poirier@linaro.org> References: <20190619172949.4522-1-mathieu.poirier@linaro.org> And Spinics has confirmed reception [1]. I hope the revised set will do the trick. Thanks, Mathieu [1]. https://www.spinics.net/lists/arm-kernel/msg736147.html > > thanks, > > greg k-h
On Wed, Jun 19, 2019 at 01:09:36PM -0600, Mathieu Poirier wrote: > On Wed, 19 Jun 2019 at 12:31, Greg KH <gregkh@linuxfoundation.org> wrote: > > > > On Wed, Jun 19, 2019 at 11:29:23AM -0600, Mathieu Poirier wrote: > > > From: Suzuki K Poulose <suzuki.poulose@arm.com> > > > > > > Rename the of_coresight_alloc_memory() => coresight_alloc_conns() > > > as it is independent of the underlying firmware type. This is in > > > preparation for the ACPI support. > > > > > > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > > --- > > > .../hwtracing/coresight/coresight-platform.c | 34 +++++++++++-------- > > > 1 file changed, 19 insertions(+), 15 deletions(-) > > > > This file is not in my tree. > > > > Did you forget to send me the commit: > > coresight: Rename of_coresight to coresight-platform > > ??? > > What ?!? > > > > > I applied all patches up to here, can you rebase and resend the > > remaining ones? > > Obviously something went wrong - let me look into it. > > Sorry for the mess and thanks for the patience. Now it showed up :( Anyway, thanks for the patches, will go queue the rest up after my morning coffee kicks in... greg k-h
diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 514cc2b67c36..4c31299607cf 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -17,6 +17,24 @@ #include <linux/cpumask.h> #include <asm/smp_plat.h> +/* + * coresight_alloc_conns: Allocate connections record for each output + * port from the device. + */ +static int coresight_alloc_conns(struct device *dev, + struct coresight_platform_data *pdata) +{ + if (pdata->nr_outport) { + pdata->conns = devm_kzalloc(dev, pdata->nr_outport * + sizeof(*pdata->conns), + GFP_KERNEL); + if (!pdata->conns) + return -ENOMEM; + } + + return 0; +} + #ifdef CONFIG_OF static int of_dev_node_match(struct device *dev, void *data) { @@ -133,20 +151,6 @@ static void of_coresight_get_ports(const struct device_node *node, } } -static int of_coresight_alloc_memory(struct device *dev, - struct coresight_platform_data *pdata) -{ - if (pdata->nr_outport) { - pdata->conns = devm_kzalloc(dev, pdata->nr_outport * - sizeof(*pdata->conns), - GFP_KERNEL); - if (!pdata->conns) - return -ENOMEM; - } - - return 0; -} - int of_coresight_get_cpu(const struct device_node *node) { int cpu; @@ -252,7 +256,7 @@ of_get_coresight_platform_data(struct device *dev, if (!pdata->nr_outport) return pdata; - ret = of_coresight_alloc_memory(dev, pdata); + ret = coresight_alloc_conns(dev, pdata); if (ret) return ERR_PTR(ret);