Skip to contentSkip to conversation

ddbridge: constify i2c_algorithm structure

PATCH In review Gustavo A. R. Silva 2 participants 3 messages Jul 10, 2017 – Jul 17, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ddbridge: constify i2c_algorithm structure

Check for i2c_algorithm structures that are only stored in the algo field of an i2c_adapter structure. This field is declared const, so i2c_algorithm structures that have this property can be declared as const also.

This issue was identified using Coccinelle and the following semantic patch:

@r disable optional_qualifier@
identifier i;
position p;
@@
static struct i2c_algorithm i@p = { ... };

@ok@
identifier r.i;
struct i2c_adapter e;
position p;
@@
e.algo = &i@p;

@bad@
position p != {r.p,ok.p};
identifier r.i;
@@
i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
struct i2c_algorithm i = { ... };

---
 drivers/media/pci/ddbridge/ddbridge-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/ddbridge/ddbridge-core.c +1 -1
index cd1723e..9663a4c 100644
@@ -200,7 +200,7 @@ static u32 ddb_i2c_functionality(struct i2c_adapter *adap)
 	return I2C_FUNC_SMBUS_EMUL;
 }
 
-static struct i2c_algorithm ddb_i2c_algo = {
+static const struct i2c_algorithm ddb_i2c_algo = {
 	.master_xfer   = ddb_i2c_master_xfer,
 	.functionality = ddb_i2c_functionality,
 };
Signature · 1 line
2.5.0
#1 lore raw

Am Sun, 9 Jul 2017 20:15:36 -0500
schrieb "Gustavo A. R. Silva" <[email protected]>:

Quoted 44 lines

Check for i2c_algorithm structures that are only stored in the algo field of an i2c_adapter structure. This field is declared const, so i2c_algorithm structures that have this property can be declared as const also.

This issue was identified using Coccinelle and the following semantic patch:

@r disable optional_qualifier@
identifier i;
position p;
@@
static struct i2c_algorithm i@p = { ... };

@ok@
identifier r.i;
struct i2c_adapter e;
position p;
@@
e.algo = &i@p;

@bad@
position p != {r.p,ok.p};
identifier r.i;
@@
i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
struct i2c_algorithm i = { ... };

---
 drivers/media/pci/ddbridge/ddbridge-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/media/pci/ddbridge/ddbridge-core.c index cd1723e..9663a4c 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c

drivers/media/pci/ddbridge/ddbridge-core.c static u32 ddb_i2c_functionality(struct · line 206

Quoted 8 lines
drivers/media/pci/ddbridge/ddbridge-core.c +1 -1
@@ -200,7 +200,7 @@ static u32 ddb_i2c_functionality(struct
 i2c_adapter *adap) return I2C_FUNC_SMBUS_EMUL;
 }
 
-static struct i2c_algorithm ddb_i2c_algo = {
+static const struct i2c_algorithm ddb_i2c_algo = {
 	.master_xfer   = ddb_i2c_master_xfer,
 	.functionality = ddb_i2c_functionality,
 };

Hi Gustavo,
Hi all,

please hold this single one patch from the constify patches back for now, since we're in the process of bumping the whole driver to a newer version which involves lots of code shuffling. With this, quite some GIT rebasing work needs to be done, and adding this one liner at a later time (thus rebasing it) is way easier.

To be sure this will not be forgotten afterwards, I've already posted a patch applying the exact change at [1].

Thank you very much!

[1] https://patchwork.linuxtv.org/patch/42393/

Best regards,
Daniel Scheller

Signature · 1 line
https://github.com/herrnst
#2 lore raw

Hi Daniel,

Quoted 64 lines · Daniel Scheller

Am Sun, 9 Jul 2017 20:15:36 -0500
schrieb "Gustavo A. R. Silva" <[email protected]>:

Quoted 44 lines

Check for i2c_algorithm structures that are only stored in the algo field of an i2c_adapter structure. This field is declared const, so i2c_algorithm structures that have this property can be declared as const also.

This issue was identified using Coccinelle and the following semantic patch:

@r disable optional_qualifier@
identifier i;
position p;
@@
static struct i2c_algorithm i@p = { ... };

@ok@
identifier r.i;
struct i2c_adapter e;
position p;
@@
e.algo = &i@p;

@bad@
position p != {r.p,ok.p};
identifier r.i;
@@
i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
struct i2c_algorithm i = { ... };

---
  drivers/media/pci/ddbridge/ddbridge-core.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/media/pci/ddbridge/ddbridge-core.c index cd1723e..9663a4c 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c

drivers/media/pci/ddbridge/ddbridge-core.c static u32 ddb_i2c_functionality(struct · line 206

Quoted 8 lines
drivers/media/pci/ddbridge/ddbridge-core.c +1 -1
@@ -200,7 +200,7 @@ static u32 ddb_i2c_functionality(struct
 i2c_adapter *adap) return I2C_FUNC_SMBUS_EMUL;
  }
 
-static struct i2c_algorithm ddb_i2c_algo = {
+static const struct i2c_algorithm ddb_i2c_algo = {
  	.master_xfer   = ddb_i2c_master_xfer,
  	.functionality = ddb_i2c_functionality,
  };

Hi Gustavo,
Hi all,

please hold this single one patch from the constify patches back for now, since we're in the process of bumping the whole driver to a newer version which involves lots of code shuffling. With this, quite some GIT rebasing work needs to be done, and adding this one liner at a later time (thus rebasing it) is way easier.

Quoted 6 lines

To be sure this will not be forgotten afterwards, I've already posted a patch applying the exact change at [1].

Thank you very much!

[1] https://patchwork.linuxtv.org/patch/42393/

Thank you!

Signature · 1 line
Gustavo A. R. Silva