Skip to contentSkip to conversation

On patch "device.h: audit and cleanup users in main include dir"

PATCH Stefan Richter 2 participants 3 messages Mar 24, 2012 – Mar 25, 2012 Firewire

lore
Share & tools
lore

Stefan Richter

author
#0 lore raw

Hi Paul,

commit 313162d0b83836e2f57e51b9b8650fb4b9c396ea is not 100.00% correct.

include/linux/firewire.h +2 -1
@@ -2,7 +2,6 @@
 #define _LINUX_FIREWIRE_H
 
 #include <linux/completion.h>
-#include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>

@@ -68,6 +67,8 @@
 #define CSR_MODEL              0x17
 #define CSR_DIRECTORY_ID       0x20
 
+struct device;
+
 struct fw_csr_iterator {
        const u32 *p;
        const u32 *end;

But struct fw_device and struct fw_unit, defined in include/firewire.h, incorporate struct device.

Furthermore, the inline function definitions
fw_device,
fw_unit,
fw_unit_get,
fw_unit_put,
fw_parent_device
all require definitions from linux/device.h.

Signature · 3 lines
Stefan Richter
-=====-===-- --== ==---
http://arcgraph.de/sr/
#1 lore raw
Quoted 24 lines · [On patch "device.h: audit and cleanup users in main include dir"] On…

Hi Paul,

commit 313162d0b83836e2f57e51b9b8650fb4b9c396ea is not 100.00% correct.

include/linux/firewire.h +2 -1
@@ -2,7 +2,6 @@
 #define _LINUX_FIREWIRE_H
 
 #include <linux/completion.h>
-#include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>

@@ -68,6 +67,8 @@
 #define CSR_MODEL              0x17
 #define CSR_DIRECTORY_ID       0x20
 
+struct device;
+
 struct fw_csr_iterator {
        const u32 *p;
        const u32 *end;
Quoted 2 lines

But struct fw_device and struct fw_unit, defined in include/firewire.h, incorporate struct device.

Hi Stefan,

You are correct. I did read them all and check instances of device, so I'm not sure how I misread this file. Did you have a specific build that triggered a failure, or you just happened to spot it? I'm guessing that it gets device.h by another path and hence won't show up in build coverage.

If so I'll definitely get it fixed, but I might wait a day or two to see if anything else pops up, if it isn't explicitly causing any breakage.

Thanks for the report,
Paul.
--

Quoted 12 lines

Furthermore, the inline function definitions
fw_device,
fw_unit,
fw_unit_get,
fw_unit_put,
fw_parent_device
all require definitions from linux/device.h.

Signature · 3 lines
Stefan Richter
-=====-===-- --== ==---
http://arcgraph.de/sr/
author
#2 lore raw
Quoted 1 line · On Mar 24 Paul Gortmaker wrote:

[On patch "device.h: audit and cleanup users in main include dir"] On 24/03/2012 (Sat 21:21) Stefan Richter wrote:

[...]

Quoted 10 lines
Quoted 2 lines

struct fw_device and struct fw_unit, defined in include/firewire.h, incorporate struct device.

Hi Stefan,

You are correct. I did read them all and check instances of device, so I'm not sure how I misread this file. Did you have a specific build that triggered a failure, or you just happened to spot it? I'm guessing that it gets device.h by another path and hence won't show up in build coverage.

I just saw the commit coming in; there is no build failure. (I should have test-built before posting.) All files which include linux/firewire.h evidently include linux/device.h before it.

Quoted 2 lines

If so I'll definitely get it fixed, but I might wait a day or two to see if anything else pops up, if it isn't explicitly causing any breakage.

If you don't receive any issues with the rest of your tree-wide commit, just do nothing and I will add a trivial firewire.h correction myself for the next merge window.

Quoted 7 lines
Quoted 7 lines

Furthermore, the inline function definitions
fw_device,
fw_unit,
fw_unit_get,
fw_unit_put,
fw_parent_device
all require definitions from linux/device.h.

Correcting myself: Only the the latter three of these use linux/device.h.

Signature · 3 lines
Stefan Richter
-=====-===-- --== ==--=
http://arcgraph.de/sr/