Skip to contentSkip to conversation

phy: broadcom: Constify structs

PATCH Applied Rikard Falkeborn 2 participants 5 messages May 16, 2020 – May 18, 2020

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

cover phy: broadcom: Constify structs

A small series adding const to a few static structs. Each patch can be applied separately.

Rikard Falkeborn (3):
phy: phy-bcm-ns2-usbdrd: Constify phy_ops
phy: sr-usb: Constify phy_ops
phy: phy-brcm-usb: Constify static structs

 drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c |  2 +-
 drivers/phy/broadcom/phy-bcm-sr-usb.c     |  2 +-
 drivers/phy/broadcom/phy-brcm-usb.c       | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/3 phy: phy-bcm-ns2-usbdrd: Constify phy_ops

phy_ops are never modified and can therefore be made const to allow the compiler to put it in read-only memory.

Before:

   text    data     bss     dec     hex filename
   7831    3144     128   11103    2b5f drivers/phy/broadcom/phy-bcm-ns2-usbdrd.o

After:

   text    data     bss     dec     hex filename
   7959    3016     128   11103    2b5f drivers/phy/broadcom/phy-bcm-ns2-usbdrd.o
---
 drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c +1 -1
index 7ceea5ae2704..527625912b78 100644
@@ -279,7 +279,7 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static struct phy_ops ops = {
+static const struct phy_ops ops = {
 	.init		= ns2_drd_phy_init,
 	.power_on	= ns2_drd_phy_poweron,
 	.power_off	= ns2_drd_phy_poweroff,
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/3 phy: sr-usb: Constify phy_ops

In reply to Rikard Falkeborn

phy_ops are never modified and can therefore be made const to allow the compiler to put it in read-only memory.

Before:
text data bss dec hex filename
4310 1244 0 5554 15b2 drivers/phy/broadcom/phy-bcm-sr-usb.o

After:
text data bss dec hex filename
4438 1116 0 5554 15b2 drivers/phy/broadcom/phy-bcm-sr-usb.o

---
 drivers/phy/broadcom/phy-bcm-sr-usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/broadcom/phy-bcm-sr-usb.c +1 -1
index fe6c58910e4c..e04be8f52744 100644
@@ -256,7 +256,7 @@ static int bcm_usb_phy_init(struct phy *phy)
 	return ret;
 }
 
-static struct phy_ops sr_phy_ops = {
+static const struct phy_ops sr_phy_ops = {
 	.init		= bcm_usb_phy_init,
 	.reset		= bcm_usb_phy_reset,
 	.owner		= THIS_MODULE,
Signature · 1 line
2.26.2
#3 lore raw

PATCH 3/3 phy: phy-brcm-usb: Constify static structs

In reply to Rikard Falkeborn

A number of structs were not modified and can therefore be made const to allow the compiler to put them in read-only memory.

In order to do so, update a few functions that don't modify there input to take pointers to const.

Before:
text data bss dec hex filename
15511 6448 64 22023 5607 drivers/phy/broadcom/phy-brcm-usb.o

After:
text data bss dec hex filename
16058 5936 64 22058 562a drivers/phy/broadcom/phy-brcm-usb.o

---
 drivers/phy/broadcom/phy-brcm-usb.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/phy/broadcom/phy-brcm-usb.c +8 -8
index 491bbd46c5b3..99fbc7e4138b 100644
@@ -39,14 +39,14 @@ struct match_chip_info {
 	u8 optional_reg;
 };
 
-static struct value_to_name_map brcm_dr_mode_to_name[] = {
+static const struct value_to_name_map brcm_dr_mode_to_name[] = {
 	{ USB_CTLR_MODE_HOST, "host" },
 	{ USB_CTLR_MODE_DEVICE, "peripheral" },
 	{ USB_CTLR_MODE_DRD, "drd" },
 	{ USB_CTLR_MODE_TYPEC_PD, "typec-pd" }
 };
 
-static struct value_to_name_map brcm_dual_mode_to_name[] = {
+static const struct value_to_name_map brcm_dual_mode_to_name[] = {
 	{ 0, "host" },
 	{ 1, "device" },
 	{ 2, "auto" },
@@ -138,7 +138,7 @@ static int brcm_usb_phy_exit(struct phy *gphy)
 	return 0;
 }
 
-static struct phy_ops brcm_usb_phy_ops = {
+static const struct phy_ops brcm_usb_phy_ops = {
 	.init		= brcm_usb_phy_init,
 	.exit		= brcm_usb_phy_exit,
 	.owner		= THIS_MODULE,
@@ -170,7 +170,7 @@ static struct phy *brcm_usb_phy_xlate(struct device *dev,
 	return ERR_PTR(-ENODEV);
 }
 
-static int name_to_value(struct value_to_name_map *table, int count,
+static int name_to_value(const struct value_to_name_map *table, int count,
 			 const char *name, int *value)
 {
 	int x;
@@ -185,7 +185,7 @@ static int name_to_value(struct value_to_name_map *table, int count,
 	return -EINVAL;
 }
 
-static const char *value_to_name(struct value_to_name_map *table, int count,
+static const char *value_to_name(const struct value_to_name_map *table, int count,
 				 int value)
 {
 	if (value >= count)
@@ -252,7 +252,7 @@ static const struct attribute_group brcm_usb_phy_group = {
 	.attrs = brcm_usb_phy_attrs,
 };
 
-static struct match_chip_info chip_info_7216 = {
+static const struct match_chip_info chip_info_7216 = {
 	.init_func = &brcm_usb_dvr_init_7216,
 	.required_regs = {
 		BRCM_REGS_CTRL,
@@ -262,7 +262,7 @@ static struct match_chip_info chip_info_7216 = {
 	},
 };
 
-static struct match_chip_info chip_info_7211b0 = {
+static const struct match_chip_info chip_info_7211b0 = {
 	.init_func = &brcm_usb_dvr_init_7211b0,
 	.required_regs = {
 		BRCM_REGS_CTRL,
@@ -275,7 +275,7 @@ static struct match_chip_info chip_info_7211b0 = {
 	.optional_reg = BRCM_REGS_BDC_EC,
 };
 
-static struct match_chip_info chip_info_7445 = {
+static const struct match_chip_info chip_info_7445 = {
 	.init_func = &brcm_usb_dvr_init_7445,
 	.required_regs = {
 		BRCM_REGS_CTRL,
Signature · 1 line
2.26.2
#4 lore raw
In reply to Rikard Falkeborn
Quoted 2 lines · Rikard Falkeborn

A small series adding const to a few static structs. Each patch can be applied separately.

merged, thanks!

-Kishon

Quoted 11 lines

Rikard Falkeborn (3):
phy: phy-bcm-ns2-usbdrd: Constify phy_ops
phy: sr-usb: Constify phy_ops
phy: phy-brcm-usb: Constify static structs

 drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c |  2 +-
 drivers/phy/broadcom/phy-bcm-sr-usb.c     |  2 +-
 drivers/phy/broadcom/phy-brcm-usb.c       | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)