| Message ID | 20160202200244.11646.12411.stgit@bhelgaas-glaptop2.roam.corp.google.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/drivers/usb/phy/phy-generic.h b/drivers/usb/phy/phy-generic.h index 0d0eadd..cc4f1bd 100644 --- a/drivers/usb/phy/phy-generic.h +++ b/drivers/usb/phy/phy-generic.h @@ -2,8 +2,9 @@ #define _PHY_GENERIC_H_ #include <linux/usb/usb_phy_generic.h> -#include <linux/gpio/consumer.h> -#include <linux/regulator/consumer.h> + +struct regulator; +struct gpio_desc; struct usb_phy_generic { struct usb_phy phy;
In drivers/usb/phy/phy-generic.h, use forward declarations for struct regulator and struct gpio_desc instead of including linux/regulator/consumer.h and linux/gpio/consumer.h. phy-generic.c is included three places (phy-am335x.c, phy-generic.c, phy-keystone.c). Of these, phy-am335x.c and phy-generic.c already include regulator/consumer.h and phy-keystone.c doesn't need it; only phy-generic.c uses gpiod_*() interfaces, and it already includes gpio/consumer.h. This is a little more efficient and ensures that users of the regulator and gpio interfaces include the relevant header files directly rather than accidentally getting them via drivers/usb/phy/phy-generic.h. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/usb/phy/phy-generic.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html