Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50430d1f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-add-const-to-mii_phy_ops-structures' 



Bhumika Goyal says:

====================
drivers: net: add const to mii_phy_ops structures

The object references of mii_phy_ops structures are only stored
in the ops field of a mii_phy_def structure. This ops field is of type
const. So, mii_phy_ops structures having similar properties can be
declared as const.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3948b57b d193d53c

drivers/net/ethernet/ibm/emac/phy.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ static int genmii_read_link(struct mii_phy *phy) 
}

}





/* Generic implementation for most 10/100/1000 PHYs */

/* Generic implementation for most 10/100/1000 PHYs */

static struct mii_phy_ops generic_phy_ops = {

static const struct mii_phy_ops generic_phy_ops = {

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,

	.setup_forced	= genmii_setup_forced,

	.setup_forced	= genmii_setup_forced,

	.poll_link	= genmii_poll_link,

	.poll_link	= genmii_poll_link,
@@ -340,7 +340,7 @@ static int cis8201_init(struct mii_phy *phy) 
	return 0;

	return 0;

}

}





static struct mii_phy_ops cis8201_phy_ops = {

static const struct mii_phy_ops cis8201_phy_ops = {

	.init		= cis8201_init,

	.init		= cis8201_init,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,

	.setup_forced	= genmii_setup_forced,

	.setup_forced	= genmii_setup_forced,
@@ -420,7 +420,7 @@ static int et1011c_init(struct mii_phy *phy) 
	return 0;

	return 0;

}

}





static struct mii_phy_ops et1011c_phy_ops = {

static const struct mii_phy_ops et1011c_phy_ops = {

	.init		= et1011c_init,

	.init		= et1011c_init,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,

	.setup_forced	= genmii_setup_forced,

	.setup_forced	= genmii_setup_forced,
@@ -439,7 +439,7 @@ static struct mii_phy_def et1011c_phy_def = { 












static struct mii_phy_ops m88e1111_phy_ops = {

static const struct mii_phy_ops m88e1111_phy_ops = {

	.init		= m88e1111_init,

	.init		= m88e1111_init,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,

	.setup_forced	= genmii_setup_forced,

	.setup_forced	= genmii_setup_forced,
@@ -455,7 +455,7 @@ static struct mii_phy_def m88e1111_phy_def = { 
	.ops		= &m88e1111_phy_ops,

	.ops		= &m88e1111_phy_ops,

};

};





static struct mii_phy_ops m88e1112_phy_ops = {

static const struct mii_phy_ops m88e1112_phy_ops = {

	.init		= m88e1112_init,

	.init		= m88e1112_init,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,

	.setup_forced	= genmii_setup_forced,

	.setup_forced	= genmii_setup_forced,
@@ -480,7 +480,7 @@ static int ar8035_init(struct mii_phy *phy) 
	return 0;

	return 0;

}

}





static struct mii_phy_ops ar8035_phy_ops = {

static const struct mii_phy_ops ar8035_phy_ops = {

	.init		= ar8035_init,

	.init		= ar8035_init,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,

	.setup_forced	= genmii_setup_forced,

	.setup_forced	= genmii_setup_forced,

drivers/net/sungem_phy.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -886,7 +886,7 @@ static int marvell_read_link(struct mii_phy *phy) 
	 SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full)

	 SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full)





/* Broadcom BCM 5201 */

/* Broadcom BCM 5201 */

static struct mii_phy_ops bcm5201_phy_ops = {

static const struct mii_phy_ops bcm5201_phy_ops = {

	.init		= bcm5201_init,

	.init		= bcm5201_init,

	.suspend	= bcm5201_suspend,

	.suspend	= bcm5201_suspend,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,
@@ -905,7 +905,7 @@ static struct mii_phy_def bcm5201_phy_def = { 
};

};





/* Broadcom BCM 5221 */

/* Broadcom BCM 5221 */

static struct mii_phy_ops bcm5221_phy_ops = {

static const struct mii_phy_ops bcm5221_phy_ops = {

	.suspend	= bcm5221_suspend,

	.suspend	= bcm5221_suspend,

	.init		= bcm5221_init,

	.init		= bcm5221_init,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,
@@ -924,7 +924,7 @@ static struct mii_phy_def bcm5221_phy_def = { 
};

};





/* Broadcom BCM 5241 */

/* Broadcom BCM 5241 */

static struct mii_phy_ops bcm5241_phy_ops = {

static const struct mii_phy_ops bcm5241_phy_ops = {

	.suspend	= bcm5241_suspend,

	.suspend	= bcm5241_suspend,

	.init		= bcm5241_init,

	.init		= bcm5241_init,

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,
@@ -942,7 +942,7 @@ static struct mii_phy_def bcm5241_phy_def = { 
};

};





/* Broadcom BCM 5400 */

/* Broadcom BCM 5400 */

static struct mii_phy_ops bcm5400_phy_ops = {

static const struct mii_phy_ops bcm5400_phy_ops = {

	.init		= bcm5400_init,

	.init		= bcm5400_init,

	.suspend	= bcm5400_suspend,

	.suspend	= bcm5400_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_aneg	= bcm54xx_setup_aneg,
@@ -961,7 +961,7 @@ static struct mii_phy_def bcm5400_phy_def = { 
};

};





/* Broadcom BCM 5401 */

/* Broadcom BCM 5401 */

static struct mii_phy_ops bcm5401_phy_ops = {

static const struct mii_phy_ops bcm5401_phy_ops = {

	.init		= bcm5401_init,

	.init		= bcm5401_init,

	.suspend	= bcm5401_suspend,

	.suspend	= bcm5401_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_aneg	= bcm54xx_setup_aneg,
@@ -980,7 +980,7 @@ static struct mii_phy_def bcm5401_phy_def = { 
};

};





/* Broadcom BCM 5411 */

/* Broadcom BCM 5411 */

static struct mii_phy_ops bcm5411_phy_ops = {

static const struct mii_phy_ops bcm5411_phy_ops = {

	.init		= bcm5411_init,

	.init		= bcm5411_init,

	.suspend	= generic_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_aneg	= bcm54xx_setup_aneg,
@@ -999,7 +999,7 @@ static struct mii_phy_def bcm5411_phy_def = { 
};

};





/* Broadcom BCM 5421 */

/* Broadcom BCM 5421 */

static struct mii_phy_ops bcm5421_phy_ops = {

static const struct mii_phy_ops bcm5421_phy_ops = {

	.init		= bcm5421_init,

	.init		= bcm5421_init,

	.suspend	= generic_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_aneg	= bcm54xx_setup_aneg,
@@ -1019,7 +1019,7 @@ static struct mii_phy_def bcm5421_phy_def = { 
};

};





/* Broadcom BCM 5421 built-in K2 */

/* Broadcom BCM 5421 built-in K2 */

static struct mii_phy_ops bcm5421k2_phy_ops = {

static const struct mii_phy_ops bcm5421k2_phy_ops = {

	.init		= bcm5421_init,

	.init		= bcm5421_init,

	.suspend	= generic_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_aneg	= bcm54xx_setup_aneg,
@@ -1037,7 +1037,7 @@ static struct mii_phy_def bcm5421k2_phy_def = { 
	.ops		= &bcm5421k2_phy_ops

	.ops		= &bcm5421k2_phy_ops

};

};





static struct mii_phy_ops bcm5461_phy_ops = {

static const struct mii_phy_ops bcm5461_phy_ops = {

	.init		= bcm5421_init,

	.init		= bcm5421_init,

	.suspend	= generic_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_aneg	= bcm54xx_setup_aneg,
@@ -1057,7 +1057,7 @@ static struct mii_phy_def bcm5461_phy_def = { 
};

};





/* Broadcom BCM 5462 built-in Vesta */

/* Broadcom BCM 5462 built-in Vesta */

static struct mii_phy_ops bcm5462V_phy_ops = {

static const struct mii_phy_ops bcm5462V_phy_ops = {

	.init		= bcm5421_init,

	.init		= bcm5421_init,

	.suspend	= generic_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= bcm54xx_setup_aneg,

	.setup_aneg	= bcm54xx_setup_aneg,
@@ -1076,7 +1076,7 @@ static struct mii_phy_def bcm5462V_phy_def = { 
};

};





/* Marvell 88E1101 amd 88E1111 */

/* Marvell 88E1101 amd 88E1111 */

static struct mii_phy_ops marvell88e1101_phy_ops = {

static const struct mii_phy_ops marvell88e1101_phy_ops = {

	.suspend	= generic_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= marvell_setup_aneg,

	.setup_aneg	= marvell_setup_aneg,

	.setup_forced	= marvell_setup_forced,

	.setup_forced	= marvell_setup_forced,
@@ -1084,7 +1084,7 @@ static struct mii_phy_ops marvell88e1101_phy_ops = { 
	.read_link	= marvell_read_link

	.read_link	= marvell_read_link

};

};





static struct mii_phy_ops marvell88e1111_phy_ops = {

static const struct mii_phy_ops marvell88e1111_phy_ops = {

	.init		= marvell88e1111_init,

	.init		= marvell88e1111_init,

	.suspend	= generic_suspend,

	.suspend	= generic_suspend,

	.setup_aneg	= marvell_setup_aneg,

	.setup_aneg	= marvell_setup_aneg,
@@ -1122,7 +1122,7 @@ static struct mii_phy_def marvell88e1111_phy_def = { 
};

};





/* Generic implementation for most 10/100 PHYs */

/* Generic implementation for most 10/100 PHYs */

static struct mii_phy_ops generic_phy_ops = {

static const struct mii_phy_ops generic_phy_ops = {

	.setup_aneg	= genmii_setup_aneg,

	.setup_aneg	= genmii_setup_aneg,

	.setup_forced	= genmii_setup_forced,

	.setup_forced	= genmii_setup_forced,

	.poll_link	= genmii_poll_link,

	.poll_link	= genmii_poll_link,