Andy Fleming wrote:
quoted text
> diff --git a/include/linux/phy.h b/include/linux/phy.h
> index 5e43ae7..92a4829 100644
> --- a/include/linux/phy.h
> +++ b/include/linux/phy.h
> @@ -63,8 +63,6 @@ typedef enum {
>  	PHY_INTERFACE_MODE_RTBI
>  } phy_interface_t;
>  
> -#define MII_BUS_MAX 4
> -
>  
>  #define PHY_INIT_TIMEOUT	100000
>  #define PHY_STATE_TIME		1
> @@ -74,20 +72,30 @@ typedef enum {
>  #define PHY_MAX_ADDR	32
>  
>  /* Used when trying to connect to a specific phy (mii bus id:phy device id) */
> -#define PHY_ID_FMT "%x:%02x"
> +#define PHY_ID_FMT "%s:%02x"
> +
> +/*
> + * Need to be a little smaller than phydev->dev.bus_id to leave room
> + * for the ":%02x"
> + */
> +#define MII_BUS_ID_SIZE	BUS_ID_SIZE - 3

The macro's definition should be parenthesised.

quoted text
>  
> -/* The Bus class for PHYs.  Devices which provide access to
> - * PHYs should register using this structure */
> +/*
> + * The Bus class for PHYs.  Devices which provide access to
> + * PHYs should register using this structure
> + */ 

I'm not sure why you reformatted this and other comments.  If you really
think it's necessary to do that, you should probably post a separate patch
rather than combining it with this functional change.

Ben.

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html