[PATCH net-next] ptp: don't include ptp_clock_kernel.h in spi.h

[PATCH net-next] ptp: don't include ptp_clock_kernel.h in spi.h

[Jakub Kicinski]

Commit b42faeee718c ("spi: Add a PTP system timestamp
to the transfer structure") added an include of ptp_clock_kernel.h
to spi.h for struct ptp_system_timestamp but a forward declaration
is enough. Let's use that to limit the number of objects we have
to rebuild every time we touch networking headers.

Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
Previous posting: https://lore.kernel.org/all/20210904013140.2377609-1-kuba@kernel.org/
---
 drivers/spi/spi.c       | 1 +
 include/linux/spi/spi.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index fdd530b150a7..dc9cf7fc8829 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -33,6 +33,7 @@
 #include <linux/highmem.h>
 #include <linux/idr.h>
 #include <linux/platform_data/x86/apple.h>
+#include <linux/ptp_clock_kernel.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/spi.h>
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index eb7ac8a1e03c..7ab3fed7b804 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -14,12 +14,12 @@
 #include <linux/completion.h>
 #include <linux/scatterlist.h>
 #include <linux/gpio/consumer.h>
-#include <linux/ptp_clock_kernel.h>
 
 #include <uapi/linux/spi/spi.h>
 
 struct dma_chan;
 struct software_node;
+struct ptp_system_timestamp;
 struct spi_controller;
 struct spi_transfer;
 struct spi_controller_mem_ops;
-- 
2.31.1

Re: [PATCH net-next] ptp: don't include ptp_clock_kernel.h in spi.h

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 533 bytes --]

On Fri, Jan 07, 2022 at 07:56:45AM -0800, Jakub Kicinski wrote:
> Commit b42faeee718c ("spi: Add a PTP system timestamp
> to the transfer structure") added an include of ptp_clock_kernel.h
> to spi.h for struct ptp_system_timestamp but a forward declaration
> is enough. Let's use that to limit the number of objects we have
> to rebuild every time we touch networking headers.

Nack, this is a purely SPI patch and should go via SPI (and you've not
even bothered to fix the subject line).  It's already in my queue with
that fixed.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH net-next] ptp: don't include ptp_clock_kernel.h in spi.h

[Jakub Kicinski]

On Fri, 7 Jan 2022 16:01:33 +0000 Mark Brown wrote:
> On Fri, Jan 07, 2022 at 07:56:45AM -0800, Jakub Kicinski wrote:
> > Commit b42faeee718c ("spi: Add a PTP system timestamp
> > to the transfer structure") added an include of ptp_clock_kernel.h
> > to spi.h for struct ptp_system_timestamp but a forward declaration
> > is enough. Let's use that to limit the number of objects we have
> > to rebuild every time we touch networking headers.  
> 
> Nack, this is a purely SPI patch and should go via SPI (and you've not
> even bothered to fix the subject line).  

Hold off unnecessary comments. If you want me to change something just
tell me rather than making vague references to following "the style for
the subsystem".

> It's already in my queue with that fixed.

What does it mean that it's in "your queue" is, it does not appear in
any branch of
ttps://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git/
Will this patch make 5.17?

Re: [PATCH net-next] ptp: don't include ptp_clock_kernel.h in spi.h

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]

On Fri, Jan 07, 2022 at 08:51:27AM -0800, Jakub Kicinski wrote:
> On Fri, 7 Jan 2022 16:01:33 +0000 Mark Brown wrote:

> > Nack, this is a purely SPI patch and should go via SPI (and you've not
> > even bothered to fix the subject line).  

> Hold off unnecessary comments. If you want me to change something just
> tell me rather than making vague references to following "the style for
> the subsystem".

If you're unclear on feedback please do ask, in this case the issue is
that you've submitted a SPI patch with a subject line starting "ptp: "
instead of "spi: " or some close enough variant of that.  The message
I sent originally is a form letter that I send for any issue with
subjects, it's not a specific thing customised.  

> > It's already in my queue with that fixed.

> What does it mean that it's in "your queue" is, it does not appear in
> any branch of
> ttps://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git/

I've queued it to be applied but I still need to actually do so and test
it, if it makes it through testing then it'll get merged - there's a
bunch of last minute patches running at the minute.  It's far enough
along that everything applied but tests are still running.

> Will this patch make 5.17?

If there's no problem with testing it should do.  I'm not sure what the
rush is though?  It's just a cleanup and this is the Friday before the
merge window.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH net-next] ptp: don't include ptp_clock_kernel.h in spi.h

[Jakub Kicinski]

On Fri, 7 Jan 2022 17:48:19 +0000 Mark Brown wrote:
> > Will this patch make 5.17?  
> 
> If there's no problem with testing it should do.

Thanks!

> I'm not sure what the rush is though?  It's just a cleanup and this
> is the Friday before the merge window.

Not rush, but PTP pulls in a lot of networking headers, would be great
if we didn't have to rebuild spi code over and over in the next cycle.