Skip to contentSkip to conversation

drivers: misc: mic: constify mbus_hw_ops structures

PATCH In review Bhumika Goyal 2 participants 2 messages Dec 20, 2016 – Jan 2, 2017

Subsystems (2)
Char and misc drivers dmaengine
lore
Share & tools
lore

Bhumika Goyal

author
#0 lore raw

PATCH 1/1 drivers: misc: mic: constify mbus_hw_ops structures

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 <[email protected]>
---
 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(-)
drivers/dma/mic_x100_dma.h +1 -1
index d899820..3cf3f99 100644
@@ -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;
 }
drivers/misc/mic/bus/mic_bus.c +1 -1
index be37890..df0c156 100644
@@ -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;
drivers/misc/mic/card/mic_x100.c +1 -1
index b9f0710..5ec6c35 100644
@@ -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,
drivers/misc/mic/host/mic_boot.c +1 -1
index 9599d73..5d86e75 100644
@@ -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,
include/linux/mic_bus.h +2 -2
index 27d7c95..722f3f9 100644
@@ -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);
Signature · 1 line
1.9.1
#1 lore raw
Quoted 5 lines · Bhumika Goyal

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.

Signature · 1 line
~Vinod