linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: LABBE Corentin <clabbe.montjoie@gmail.com>
To: lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org, LABBE Corentin <clabbe.montjoie@gmail.com>
Subject: [PATCH 1/2] mfd: mc13xxx: constify mc13xxx_variant
Date: Tue, 16 Aug 2016 10:15:21 +0200	[thread overview]
Message-ID: <1471335322-6814-1-git-send-email-clabbe.montjoie@gmail.com> (raw)

The mc13xxx_variant structure is never modified, this patch set it as
const.

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
---
 drivers/mfd/mc13xxx-core.c | 6 +++---
 drivers/mfd/mc13xxx-i2c.c  | 2 +-
 drivers/mfd/mc13xxx-spi.c  | 2 +-
 drivers/mfd/mc13xxx.h      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index d7f54e4..3a008e6 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -202,19 +202,19 @@ static void mc34708_print_revision(struct mc13xxx *mc13xxx, u32 revision)
 }
 
 /* These are only exported for mc13xxx-i2c and mc13xxx-spi */
-struct mc13xxx_variant mc13xxx_variant_mc13783 = {
+const struct mc13xxx_variant mc13xxx_variant_mc13783 = {
 	.name = "mc13783",
 	.print_revision = mc13xxx_print_revision,
 };
 EXPORT_SYMBOL_GPL(mc13xxx_variant_mc13783);
 
-struct mc13xxx_variant mc13xxx_variant_mc13892 = {
+const struct mc13xxx_variant mc13xxx_variant_mc13892 = {
 	.name = "mc13892",
 	.print_revision = mc13xxx_print_revision,
 };
 EXPORT_SYMBOL_GPL(mc13xxx_variant_mc13892);
 
-struct mc13xxx_variant mc13xxx_variant_mc34708 = {
+const struct mc13xxx_variant mc13xxx_variant_mc34708 = {
 	.name = "mc34708",
 	.print_revision = mc34708_print_revision,
 };
diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index 67e4c9a..3c00ccb 100644
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -82,7 +82,7 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
 			of_match_device(mc13xxx_dt_ids, &client->dev);
 		mc13xxx->variant = of_id->data;
 	} else {
-		mc13xxx->variant = (void *)id->driver_data;
+		mc13xxx->variant = (const struct mc13xxx_variant *)id->driver_data;
 	}
 
 	return mc13xxx_common_init(&client->dev);
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index cbc1e5e..6100025 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -162,7 +162,7 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
 	} else {
 		const struct spi_device_id *id_entry = spi_get_device_id(spi);
 
-		mc13xxx->variant = (void *)id_entry->driver_data;
+		mc13xxx->variant = (const struct mc13xxx_variant *)id_entry->driver_data;
 	}
 
 	return mc13xxx_common_init(&spi->dev);
diff --git a/drivers/mfd/mc13xxx.h b/drivers/mfd/mc13xxx.h
index 33677d1..6d7fce5 100644
--- a/drivers/mfd/mc13xxx.h
+++ b/drivers/mfd/mc13xxx.h
@@ -24,7 +24,7 @@ struct mc13xxx_variant {
 	void (*print_revision)(struct mc13xxx *mc13xxx, u32 revision);
 };
 
-extern struct mc13xxx_variant
+extern const struct mc13xxx_variant
 		mc13xxx_variant_mc13783,
 		mc13xxx_variant_mc13892,
 		mc13xxx_variant_mc34708;
-- 
2.7.3

             reply	other threads:[~2016-08-16  8:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-16  8:15 LABBE Corentin [this message]
2016-08-16  8:15 ` [PATCH 2/2] mfd: mc13xxx: fix a possible NULL dereference LABBE Corentin
2016-08-31  9:23   ` Lee Jones
2016-08-31  9:20 ` [PATCH 1/2] mfd: mc13xxx: constify mc13xxx_variant Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1471335322-6814-1-git-send-email-clabbe.montjoie@gmail.com \
    --to=clabbe.montjoie@gmail.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).