drivers: misc: mic: constify mbus_hw_ops structures

Commit Message

Bhumika Goyal Dec. 20, 2016, 10:56 a.m. UTC

The fields of structure mbus_hw_ops are never modified after
initialization, so declare these structures as const. Add a const
annotation to all its initializations and uses like function arguments
and pointers.
Used Coccinelle to find all the occurences.

Size details:

File size before:
text    data     bss     dec     hex filename
 1401    1752     232    3385     d39 drivers/misc/mic/card/mic_x100.o
 4116     584       0    4700    125c drivers/misc/mic/host/mic_boot.o

File size after:
text    data     bss     dec    hex filename
 1432    1728     232    3392    d40 drivers/misc/mic/card/mic_x100.o
 4148    552       0    4700    125c drivers/misc/mic/host/mic_boot.o

Signed-off-by: Bhumika Goyal <[e-mail]>
---
 drivers/dma/mic_x100_dma.h       | 2 +-
 drivers/misc/mic/bus/mic_bus.c   | 2 +-
 drivers/misc/mic/card/mic_x100.c | 2 +-
 drivers/misc/mic/host/mic_boot.c | 2 +-
 include/linux/mic_bus.h          | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

Comments

Vinod Koul Jan. 2, 2017, 5:10 a.m. UTC | #1

On Tue, Dec 20, 2016 at 04:26:17PM +0530, Bhumika Goyal wrote:
> The fields of structure mbus_hw_ops are never modified after
> initialization, so declare these structures as const. Add a const
> annotation to all its initializations and uses like function arguments
> and pointers.
> Used Coccinelle to find all the occurences.

Can you please split these per driver so that they can be merged thru their
own subsystems.

Patch

diff --git a/drivers/dma/mic_x100_dma.h b/drivers/dma/mic_x100_dma.h
index d899820..3cf3f99 100644
--- a/drivers/dma/mic_x100_dma.h
+++ b/drivers/dma/mic_x100_dma.h
@@ -165,7 +165,7 @@  static inline struct mbus_device *to_mbus_device(struct mic_dma_chan *ch)
 	return to_mic_dma_dev(ch)->mbdev;
 }
 
-static inline struct mbus_hw_ops *to_mbus_hw_ops(struct mic_dma_chan *ch)
+static inline const struct mbus_hw_ops *to_mbus_hw_ops(struct mic_dma_chan *ch)
 {
 	return to_mbus_device(ch)->hw_ops;
 }
diff --git a/drivers/misc/mic/bus/mic_bus.c b/drivers/misc/mic/bus/mic_bus.c
index be37890..df0c156 100644
--- a/drivers/misc/mic/bus/mic_bus.c
+++ b/drivers/misc/mic/bus/mic_bus.c
@@ -144,7 +144,7 @@  static void mbus_release_dev(struct device *d)
 
 struct mbus_device *
 mbus_register_device(struct device *pdev, int id, struct dma_map_ops *dma_ops,
-		     struct mbus_hw_ops *hw_ops, int index,
+		     const struct mbus_hw_ops *hw_ops, int index,
 		     void __iomem *mmio_va)
 {
 	int ret;
diff --git a/drivers/misc/mic/card/mic_x100.c b/drivers/misc/mic/card/mic_x100.c
index b9f0710..5ec6c35 100644
--- a/drivers/misc/mic/card/mic_x100.c
+++ b/drivers/misc/mic/card/mic_x100.c
@@ -234,7 +234,7 @@  static void _mic_ack_interrupt(struct mbus_device *mbdev, int num)
 	mic_ack_interrupt(&mbdev_to_mdrv(mbdev)->mdev);
 }
 
-static struct mbus_hw_ops mbus_hw_ops = {
+static const struct mbus_hw_ops mbus_hw_ops = {
 	.request_threaded_irq = _mic_request_threaded_irq,
 	.free_irq = _mic_free_irq,
 	.ack_interrupt = _mic_ack_interrupt,
diff --git a/drivers/misc/mic/host/mic_boot.c b/drivers/misc/mic/host/mic_boot.c
index 9599d73..5d86e75 100644
--- a/drivers/misc/mic/host/mic_boot.c
+++ b/drivers/misc/mic/host/mic_boot.c
@@ -371,7 +371,7 @@  static void _mic_ack_interrupt(struct mbus_device *mbdev, int num)
 	mdev->ops->intr_workarounds(mdev);
 }
 
-static struct mbus_hw_ops mbus_hw_ops = {
+static const struct mbus_hw_ops mbus_hw_ops = {
 	.request_threaded_irq = _mic_request_threaded_irq,
 	.free_irq = _mic_free_irq,
 	.ack_interrupt = _mic_ack_interrupt,
diff --git a/include/linux/mic_bus.h b/include/linux/mic_bus.h
index 27d7c95..722f3f9 100644
--- a/include/linux/mic_bus.h
+++ b/include/linux/mic_bus.h
@@ -49,7 +49,7 @@  struct mbus_device_id {
  */
 struct mbus_device {
 	void __iomem *mmio_va;
-	struct mbus_hw_ops *hw_ops;
+	const struct mbus_hw_ops *hw_ops;
 	struct mbus_device_id id;
 	struct device dev;
 	int index;
@@ -91,7 +91,7 @@  struct mbus_hw_ops {
 
 struct mbus_device *
 mbus_register_device(struct device *pdev, int id, struct dma_map_ops *dma_ops,
-		     struct mbus_hw_ops *hw_ops, int index,
+		     const struct mbus_hw_ops *hw_ops, int index,
 		     void __iomem *mmio_va);
 void mbus_unregister_device(struct mbus_device *mbdev);