Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1570531
| From | Corentin Labbe <clabbe.montjoie@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 06/17] net: stmmac: fix some code style problem |
| Date | 2017-01-31 10:50 +0100 |
| Message-ID | <t5Dey-7w7-9@gated-at.bofh.it> (permalink) |
| References | <t5CLw-7mj-19@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Checkpatch complains about some code style problem on stmmac_mdio.c.
This patch fix them.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 3fdc6ec..c24bef2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -152,9 +152,9 @@ int stmmac_mdio_reset(struct mii_bus *bus)
#ifdef CONFIG_OF
if (priv->device->of_node) {
-
if (data->reset_gpio < 0) {
struct device_node *np = priv->device->of_node;
+
if (!np)
return 0;
@@ -221,7 +221,7 @@ int stmmac_mdio_register(struct net_device *ndev)
return 0;
new_bus = mdiobus_alloc();
- if (new_bus == NULL)
+ if (!new_bus)
return -ENOMEM;
if (mdio_bus_data->irqs)
@@ -258,6 +258,7 @@ int stmmac_mdio_register(struct net_device *ndev)
found = 0;
for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
struct phy_device *phydev = mdiobus_get_phy(new_bus, addr);
+
if (phydev) {
int act = 0;
char irq_num[4];
@@ -267,7 +268,7 @@ int stmmac_mdio_register(struct net_device *ndev)
* If an IRQ was provided to be assigned after
* the bus probe, do it here.
*/
- if ((mdio_bus_data->irqs == NULL) &&
+ if ((!mdio_bus_data->irqs) &&
(mdio_bus_data->probed_phy_irq > 0)) {
new_bus->irq[addr] =
mdio_bus_data->probed_phy_irq;
--
2.10.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/17] net: stmmac: misc fix Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:30 +0100
[PATCH 08/17] net: stmmac: Use readl_poll_timeout Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:30 +0100
[PATCH 07/17] net: stmmac: replace stmmac_mdio_busy_wait by readl_poll_timeout Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:30 +0100
Re: [PATCH 07/17] net: stmmac: replace stmmac_mdio_busy_wait by readl_poll_timeout Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 11:40 +0100
Re: [PATCH 07/17] net: stmmac: replace stmmac_mdio_busy_wait by readl_poll_timeout Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:50 +0100
Re: [PATCH 07/17] net: stmmac: replace stmmac_mdio_busy_wait by readl_poll_timeout Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:50 +0100
[PATCH 10/17] net: stmmac: Correct the error message about invalid speed Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:30 +0100
Re: [PATCH 10/17] net: stmmac: Correct the error message about invalid speed Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:10 +0100
[PATCH 02/17] net: stmmac: Remove the bus_setup function pointer Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:30 +0100
Re: [PATCH 02/17] net: stmmac: Remove the bus_setup function pointer Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:10 +0100
[PATCH 11/17] net: stmmac: Rewrite two test against NULL value Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:30 +0100
Re: [PATCH 11/17] net: stmmac: Rewrite two test against NULL value Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:10 +0100
[PATCH 01/17] net: stmmac: fix the typo on MAC_RNABLE_RX Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:30 +0100
[PATCH 14/17] net: stmmac: print phy information Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:50 +0100
Re: [PATCH 14/17] net: stmmac: print phy information Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:20 +0100
Re: [PATCH 14/17] net: stmmac: print phy information Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-02-03 14:20 +0100
[PATCH 06/17] net: stmmac: fix some code style problem Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:50 +0100
Re: [PATCH 06/17] net: stmmac: fix some code style problem Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:10 +0100
[PATCH 05/17] net: stmmac: remplace asm/io.h by linux/io.h Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:50 +0100
[PATCH 15/17] net: stmmac: remove dead code in stmmac_tx_clean Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-01-31 10:50 +0100
Re: [PATCH 00/17] net: stmmac: misc fix Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:10 +0100
Re: [PATCH 00/17] net: stmmac: misc fix Joao Pinto <Joao.Pinto@synopsys.com> - 2017-01-31 11:40 +0100
Re: [PATCH 00/17] net: stmmac: misc fix Giuseppe CAVALLARO <peppe.cavallaro@st.com> - 2017-01-31 11:40 +0100
Re: [PATCH 00/17] net: stmmac: misc fix Joao Pinto <Joao.Pinto@synopsys.com> - 2017-01-31 11:50 +0100
csiph-web