sfc: Remove efx_channel::has_interrupt

[linux-2.6-omap-h63xx.git] / drivers / net / sfc / mdio_10g.h

diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h
index cb99f3f4491c5413c27435f188824d68fe11f988..19c42eaf7fb47d714087c62efed01f3242b802c3 100644 (file)
--- a/drivers/net/sfc/mdio_10g.h
+++ b/drivers/net/sfc/mdio_10g.h
@@ -199,18 +199,19 @@ static inline u32 mdio_clause45_read_id(struct efx_nic *efx, int mmd)
        return (id_hi << 16) | (id_low);
 }
 
-static inline int mdio_clause45_phyxgxs_lane_sync(struct efx_nic *efx)
+static inline bool mdio_clause45_phyxgxs_lane_sync(struct efx_nic *efx)
 {
-       int i, sync, lane_status;
+       int i, lane_status;
+       bool sync;
 
        for (i = 0; i < 2; ++i)
                lane_status = mdio_clause45_read(efx, efx->mii.phy_id,
                                                 MDIO_MMD_PHYXS,
                                                 MDIO_PHYXS_LANE_STATE);
 
-       sync = (lane_status & (1 << MDIO_PHYXS_LANE_ALIGNED_LBN)) != 0;
+       sync = !!(lane_status & (1 << MDIO_PHYXS_LANE_ALIGNED_LBN));
        if (!sync)
-               EFX_INFO(efx, "XGXS lane status: %x\n", lane_status);
+               EFX_LOG(efx, "XGXS lane status: %x\n", lane_status);
        return sync;
 }
 
@@ -230,8 +231,8 @@ int mdio_clause45_check_mmds(struct efx_nic *efx,
                             unsigned int mmd_mask, unsigned int fatal_mask);
 
 /* Check the link status of specified mmds in bit mask */
-extern int mdio_clause45_links_ok(struct efx_nic *efx,
-                                 unsigned int mmd_mask);
+extern bool mdio_clause45_links_ok(struct efx_nic *efx,
+                                  unsigned int mmd_mask);
 
 /* Generic transmit disable support though PMAPMD */
 extern void mdio_clause45_transmit_disable(struct efx_nic *efx);