Hi Andrew,
On Tue, Jan 24, 2017 at 9:03 PM, Andrew Lunn <andrew@xxxxxxx> wrote:
>> diff --git a/include/linux/phy.h b/include/linux/phy.h
>> index 5c9d2529685fe215..f6ab919528ab3627 100644
>> --- a/include/linux/phy.h
>> +++ b/include/linux/phy.h
>> @@ -25,7 +25,6 @@
>> #include <linux/timer.h>
>> #include <linux/workqueue.h>
>> #include <linux/mod_devicetable.h>
>> -#include <linux/phy_led_triggers.h>
>>
>> #include <linux/atomic.h>
>>
>> @@ -339,6 +338,8 @@ struct phy_c45_device_ids {
>> u32 device_ids[8];
>> };
>>
>> +#include <linux/phy_led_triggers.h>
>> +
>> /* phy_device: An instance of a PHY
>> *
>> * drv: Pointer to the driver for this PHY instance
>> diff --git a/include/linux/phy_led_triggers.h b/include/linux/phy_led_triggers.h
>> index a2daea0a37d2ae14..69dffb4fc5a294e9 100644
>> --- a/include/linux/phy_led_triggers.h
>> +++ b/include/linux/phy_led_triggers.h
>> @@ -20,9 +20,8 @@
>> #include <linux/leds.h>
>>
>> #define PHY_LED_TRIGGER_SPEED_SUFFIX_SIZE 10
>> -#define PHY_MII_BUS_ID_SIZE (20 - 3)
>>
>> -#define PHY_LINK_LED_TRIGGER_NAME_SIZE (PHY_MII_BUS_ID_SIZE + \
>> +#define PHY_LINK_LED_TRIGGER_NAME_SIZE (MII_BUS_ID_SIZE + \
>> FIELD_SIZEOF(struct mdio_device, addr)+\
>> PHY_LED_TRIGGER_SPEED_SUFFIX_SIZE)
>
> Hi Geert
>
> Using the macro is great, but it does seem a bit ugly having the
> include in the middle of the file.
>
> As far as i can see, phy.h only uses a pointer to a struct
> phy_led_trigger, not struct phy_led_trigger itself. Could you try
> removing the header file all together and just have a forward
> declaration of phy_led_trigger?
Thanks for the suggestion!
Yes, the include can be removed. A forward declaration isn't even needed.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
