diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2016-02-02 12:17:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-04 08:10:39 +0100 |
| commit | 9fc7b70a28d14d1d28d918bf9de44127d7c775de (patch) | |
| tree | ca101b90e226fb8e5b067a842ccdb9fd4cc9f80a /drivers | |
| parent | ea89f30bbd5cd356d27870d6d83fe215c01b14fd (diff) | |
| download | barebox-9fc7b70a28d14d1d28d918bf9de44127d7c775de.tar.gz barebox-9fc7b70a28d14d1d28d918bf9de44127d7c775de.tar.xz | |
net: phy: micrel: Be more const correct
Based on kernel commit 3c9a9f7fb0ee ("net/phy: micrel: Be more const
correct") by Jaeden Amero <jaeden.amero@ni.com>:
In a few places in this driver, we weren't using const where we could
have. Use const more.
In addition, change the arrays of strings in ksz9031_config_init() to be
not only const, but also static.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/micrel.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 0c97e25e9a..6f49e73530 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -91,8 +91,8 @@ static int ks8051_config_init(struct phy_device *phydev) } static int ksz9021_load_values_from_of(struct phy_device *phydev, - struct device_node *of_node, u16 reg, - const char *field[]) + const struct device_node *of_node, + u16 reg, const char *field[]) { int val, regval, i; @@ -113,8 +113,8 @@ static int ksz9021_load_values_from_of(struct phy_device *phydev, static int ksz9021_config_init(struct phy_device *phydev) { - struct device_d *dev = &phydev->dev; - struct device_node *of_node = dev->device_node; + const struct device_d *dev = &phydev->dev; + const struct device_node *of_node = dev->device_node; const char *clk_pad_skew_names[] = { "txen-skew-ps", "txc-skew-ps", "rxdv-skew-ps", "rxc-skew-ps" @@ -155,9 +155,9 @@ static int ksz9021_config_init(struct phy_device *phydev) #define MII_KSZ9031RN_CLK_PAD_SKEW 8 static int ksz9031_of_load_skew_values(struct phy_device *phydev, - struct device_node *of_node, + const struct device_node *of_node, u16 reg, size_t field_sz, - char *field[], u8 numfields) + const char *field[], u8 numfields) { int val[4] = {-1, -2, -3, -4}; int matches = 0; @@ -194,18 +194,18 @@ static int ksz9031_of_load_skew_values(struct phy_device *phydev, static int ksz9031_config_init(struct phy_device *phydev) { - struct device_d *dev = &phydev->dev; - struct device_node *of_node = dev->device_node; - char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"}; - char *rx_data_skews[4] = { + const struct device_d *dev = &phydev->dev; + const struct device_node *of_node = dev->device_node; + static const char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"}; + static const char *rx_data_skews[4] = { "rxd0-skew-ps", "rxd1-skew-ps", "rxd2-skew-ps", "rxd3-skew-ps" }; - char *tx_data_skews[4] = { + static const char *tx_data_skews[4] = { "txd0-skew-ps", "txd1-skew-ps", "txd2-skew-ps", "txd3-skew-ps" }; - char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"}; + static const char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"}; if (!of_node && dev->parent->device_node) of_node = dev->parent->device_node; |