Skip to contentSkip to conversation

ptp: don't include ptp_clock_kernel.h in spi.h

PATCH NAK Jakub Kicinski 2 participants 5 messages Jan 7, 2022

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 ptp: don't include ptp_clock_kernel.h in spi.h

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.

---
Previous posting: https://lore.kernel.org/all/[email protected]/

---
 drivers/spi/spi.c       | 1 +
 include/linux/spi/spi.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi.c +1 -0
index fdd530b150a7..dc9cf7fc8829 100644
@@ -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>
include/linux/spi/spi.h +1 -1
index eb7ac8a1e03c..7ab3fed7b804 100644
@@ -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;
Signature · 1 line
2.31.1
maintainer NAK
#1 lore raw
Quoted 5 lines · 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.

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.

author maintainer
#2 lore raw
Quoted 9 lines · On Fri, 7 Jan 2022 16:01:33 +0000 Mark Brown wrote:
Quoted 5 lines · 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.

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".

Quoted 1 line

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?

maintainer
#3 lore raw
Quoted 8 lines · Jakub Kicinski
Quoted 2 lines · 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.

Quoted 5 lines
Quoted 1 line

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.

Quoted 1 line

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.

author maintainer
#4 lore raw
Quoted 3 lines · On Fri, 7 Jan 2022 17:48:19 +0000 Mark Brown wrote:
Quoted 1 line

Will this patch make 5.17?

If there's no problem with testing it should do.

Thanks!

Quoted 2 lines

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.