Skip to contentSkip to conversation

mod_devicetable.h: Make the definition of struct of_device_id easier to find

PATCH In review Joe Perches 2 participants 5 messages Feb 9, 2015 – Feb 10, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mod_devicetable.h: Make the definition of struct of_device_id easier to find

Move the open brace so the definition matches the more common kernel style. This makes grep a bit easier.

---
 include/linux/mod_devicetable.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/mod_devicetable.h +1 -2
index 470a240..2e75ab0 100644
@@ -220,8 +220,7 @@ struct serio_device_id {
 /*
  * Struct used for matching a device
  */
-struct of_device_id
-{
+struct of_device_id {
 	char	name[32];
 	char	type[32];
 	char	compatible[128];
#1 lore raw
Quoted 2 lines · Joe Perches

Move the open brace so the definition matches the more common kernel style. This makes grep a bit easier.

I've got the same fix in -next for 3.20 already:

commit 851c63e3b381fdbf5aca1a797f37d8606b5588d2

Author: Daniel Thompson <[email protected]>
Date:   Mon Jan 5 15:43:39 2015 +0000

of: Fix brace position for struct of_device_id definition

Currently it is not easy to grep for the definition of struct of_device_id. This is trivially fixed by moving the brace to the right place.

Quoted 22 lines
---
 include/linux/mod_devicetable.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/mod_devicetable.h +1 -2
index 470a240..2e75ab0 100644
@@ -220,8 +220,7 @@ struct serio_device_id {
 /*
  * Struct used for matching a device
  */
-struct of_device_id
-{
+struct of_device_id {
        char    name[32];
        char    type[32];
        char    compatible[128];
#2 lore raw
Quoted 3 lines · Rob Herring
Quoted 2 lines · Joe Perches

Move the open brace so the definition matches the more common kernel style. This makes grep a bit easier.

Hey Rob.

Quoted 1 line

I've got the same fix in -next for 3.20 already:

Then you should push that change to Stephen's -next 'cause it's not there.

Quoted 1 line

commit 851c63e3b381fdbf5aca1a797f37d8606b5588d2

#3 lore raw
Quoted 11 lines · Joe Perches
Quoted 3 lines · Rob Herring
Quoted 2 lines · Joe Perches

Move the open brace so the definition matches the more common kernel style. This makes grep a bit easier.

Hey Rob.

Quoted 1 line

I've got the same fix in -next for 3.20 already:

Then you should push that change to Stephen's -next 'cause it's not there.

Huh? I just double checked that it is in fact in 20150209.

Rob

Quoted 4 lines
Quoted 2 lines

commit 851c63e3b381fdbf5aca1a797f37d8606b5588d2

#4 lore raw
Quoted 6 lines · Rob Herring
Quoted 5 lines · Joe Perches
Quoted 3 lines · Rob Herring
Quoted 2 lines · Joe Perches

Move the open brace so the definition matches the more common kernel style. This makes grep a bit easier.

Quoted 8 lines
Quoted 6 lines

Hey Rob.

Quoted 1 line

I've got the same fix in -next for 3.20 already:

Then you should push that change to Stephen's -next 'cause it's not there.

Huh? I just double checked that it is in fact in 20150209.

It is in next-20150209, but not in anything earlier.

That'd might have been in _your_ branch, but it wasn't in linux-next as of 20150204 when I made that patch.

You should make sure that Stephen merges the right branch and not want for the Linus' tagged release.

There's no real reason I can see for you to wait to push your -next branch immediately.

cheers, Joe

$ git checkout next-20150204
HEAD is now at 29d56e4... Add linux-next specific files for 20150209
$ git log --pretty=oneline include/linux/mod_devicetable.h
32357605ce7bcd36cb6215a21cad12cd8f51b74e USB: Add missing word to comment in mod_devicetable.h
de869917c663f44b5b032bff238bad22e15dda56 mod_devicetable.h: grammar fix in comment
c4586256f0c440bc2bdb29d2cbb915f0ca785d26 x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id"
158e0d3621683ee0cdfeeba56f0e5ddd97ae984f Merge tag 'driver-core-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
3764e82e5150d87b205c10cd78a9c9ab86fbfa51 drivers: Introduce MEN Chameleon Bus
67bad2fdb754dbef14596c0b5d28b3a12c8dfe84 cpu: add generic support for CPU feature based module autoloading
5a86bf343976b9c8ab2f240bc866451fa67e5573 spmi: Linux driver framework for SPMI
b04c99e3b845892d754ee8052d6324c39c4040de Revert "Input: introduce BTN/ABS bits for drums and guitars"
63faf15dba4a7d6fb18ed5c45670a152d0c5330b Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt', 'for-3.12/logitech', 'for-3.
61e00655e9cb82e034eb72b95a51072e718d14a7 Input: introduce BTN/ABS bits for drums and guitars
b01a60be7a4a161ac0a11df30569d21a20795aef ssb: fix alignment of struct bcma_device_id
3bdbb62fe97537252b22f700009863eeb51aa750 rapidio: add udev notification
5017b2851373ee15c7035151853bb1448800cae2 dmi: add support for exact DMI matches in addition to substring matching
e5354107e14755991da82e0d2a4791db92908d9d mei: bus: Initial MEI Client bus type implementation
6543becf26fff612cdadeed7250ccc8d49f67f27 mod/file2alias: make modalias generation safe for cross compiling