| Message ID | 1394210888-1587-1-git-send-email-kishon@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 07, 2014 at 10:18:08PM +0530, Kishon Vijay Abraham I wrote: > No functional change. Moved omap_usb.h from linux/usb/ to linux/phy/. > Also removed the unused members of struct omap_usb (after phy-omap-pipe3 > started using it's own header file) does this depend in any other patch ? I get the following when applying *only* this patch on top of v3.14-rc5: drivers/phy/phy-omap-usb2.c: In function ‘omap_usb2_suspend’: drivers/phy/phy-omap-usb2.c:106:21: error: ‘struct omap_usb’ has no member named ‘is_suspended’ if (suspend && !phy->is_suspended) { ^ drivers/phy/phy-omap-usb2.c:109:6: error: ‘struct omap_usb’ has no member named ‘is_suspended’ phy->is_suspended = 1; ^ drivers/phy/phy-omap-usb2.c:110:28: error: ‘struct omap_usb’ has no member named ‘is_suspended’ } else if (!suspend && phy->is_suspended) { ^ drivers/phy/phy-omap-usb2.c:117:6: error: ‘struct omap_usb’ has no member named ‘is_suspended’ phy->is_suspended = 0; ^ drivers/phy/phy-omap-usb2.c: In function ‘omap_usb2_probe’: drivers/phy/phy-omap-usb2.c:194:5: error: ‘struct omap_usb’ has no member named ‘is_suspended’ phy->is_suspended = 1; ^ make[1]: *** [drivers/phy/phy-omap-usb2.o] Error 1 make: *** [drivers/phy/] Error 2 make: *** Waiting for unfinished jobs.... CC [M] drivers/usb/phy/phy-mxs-usb.o drivers/usb/phy/phy-omap-usb3.c:22:32: fatal error: linux/usb/omap_usb.h: No such file or directory #include <linux/usb/omap_usb.h> ^ compilation terminated. make[1]: *** [drivers/usb/phy/phy-omap-usb3.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [drivers/usb/phy/] Error 2
On Friday 07 March 2014 10:20 PM, Felipe Balbi wrote: > On Fri, Mar 07, 2014 at 10:18:08PM +0530, Kishon Vijay Abraham I wrote: >> No functional change. Moved omap_usb.h from linux/usb/ to linux/phy/. >> Also removed the unused members of struct omap_usb (after phy-omap-pipe3 >> started using it's own header file) > > does this depend in any other patch ? I get the following when applying > *only* this patch on top of v3.14-rc5: yeah.. this is for linux-phy tree. I'll take this patch. Thanks Kishon > > drivers/phy/phy-omap-usb2.c: In function ‘omap_usb2_suspend’: > drivers/phy/phy-omap-usb2.c:106:21: error: ‘struct omap_usb’ has no member named ‘is_suspended’ > if (suspend && !phy->is_suspended) { > ^ > drivers/phy/phy-omap-usb2.c:109:6: error: ‘struct omap_usb’ has no member named ‘is_suspended’ > phy->is_suspended = 1; > ^ > drivers/phy/phy-omap-usb2.c:110:28: error: ‘struct omap_usb’ has no member named ‘is_suspended’ > } else if (!suspend && phy->is_suspended) { > ^ > drivers/phy/phy-omap-usb2.c:117:6: error: ‘struct omap_usb’ has no member named ‘is_suspended’ > phy->is_suspended = 0; > ^ > drivers/phy/phy-omap-usb2.c: In function ‘omap_usb2_probe’: > drivers/phy/phy-omap-usb2.c:194:5: error: ‘struct omap_usb’ has no member named ‘is_suspended’ > phy->is_suspended = 1; > ^ > make[1]: *** [drivers/phy/phy-omap-usb2.o] Error 1 > make: *** [drivers/phy/] Error 2 > make: *** Waiting for unfinished jobs.... > CC [M] drivers/usb/phy/phy-mxs-usb.o > drivers/usb/phy/phy-omap-usb3.c:22:32: fatal error: linux/usb/omap_usb.h: No such file or directory > #include <linux/usb/omap_usb.h> > ^ > compilation terminated. > make[1]: *** [drivers/usb/phy/phy-omap-usb3.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... > make: *** [drivers/usb/phy/] Error 2 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 07, 2014 at 11:09:02PM +0530, Kishon Vijay Abraham I wrote: > On Friday 07 March 2014 10:20 PM, Felipe Balbi wrote: > >On Fri, Mar 07, 2014 at 10:18:08PM +0530, Kishon Vijay Abraham I wrote: > >>No functional change. Moved omap_usb.h from linux/usb/ to linux/phy/. > >>Also removed the unused members of struct omap_usb (after phy-omap-pipe3 > >>started using it's own header file) > > > >does this depend in any other patch ? I get the following when applying > >*only* this patch on top of v3.14-rc5: > > yeah.. this is for linux-phy tree. I'll take this patch. looks like you're doing two things at once (renaming the header and removing some unnecessary fields). At least mention the second thing. cheers
On Friday 07 March 2014 11:10 PM, Felipe Balbi wrote: > On Fri, Mar 07, 2014 at 11:09:02PM +0530, Kishon Vijay Abraham I wrote: >> On Friday 07 March 2014 10:20 PM, Felipe Balbi wrote: >>> On Fri, Mar 07, 2014 at 10:18:08PM +0530, Kishon Vijay Abraham I wrote: >>>> No functional change. Moved omap_usb.h from linux/usb/ to linux/phy/. >>>> Also removed the unused members of struct omap_usb (after phy-omap-pipe3 >>>> started using it's own header file) >>> >>> does this depend in any other patch ? I get the following when applying >>> *only* this patch on top of v3.14-rc5: >> >> yeah.. this is for linux-phy tree. I'll take this patch. > > looks like you're doing two things at once (renaming the header and > removing some unnecessary fields). At least mention the second thing. The second line of the commit message mentions just that ;-) Regards Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 07, 2014 at 11:16:10PM +0530, Kishon Vijay Abraham I wrote: > On Friday 07 March 2014 11:10 PM, Felipe Balbi wrote: > >On Fri, Mar 07, 2014 at 11:09:02PM +0530, Kishon Vijay Abraham I wrote: > >>On Friday 07 March 2014 10:20 PM, Felipe Balbi wrote: > >>>On Fri, Mar 07, 2014 at 10:18:08PM +0530, Kishon Vijay Abraham I wrote: > >>>>No functional change. Moved omap_usb.h from linux/usb/ to linux/phy/. > >>>>Also removed the unused members of struct omap_usb (after phy-omap-pipe3 > >>>>started using it's own header file) > >>> > >>>does this depend in any other patch ? I get the following when applying > >>>*only* this patch on top of v3.14-rc5: > >> > >>yeah.. this is for linux-phy tree. I'll take this patch. > > > >looks like you're doing two things at once (renaming the header and > >removing some unnecessary fields). At least mention the second thing. > > The second line of the commit message mentions just that ;-) hmmm, my parser didn't read that, nevermind ;-)
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c index 705af5a..9c3f056 100644 --- a/drivers/phy/phy-omap-usb2.c +++ b/drivers/phy/phy-omap-usb2.c @@ -21,7 +21,7 @@ #include <linux/slab.h> #include <linux/of.h> #include <linux/io.h> -#include <linux/usb/omap_usb.h> +#include <linux/phy/omap_usb.h> #include <linux/usb/phy_companion.h> #include <linux/clk.h> #include <linux/err.h> diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c index 214172b..04778cf 100644 --- a/drivers/usb/phy/phy-twl6030-usb.c +++ b/drivers/usb/phy/phy-twl6030-usb.c @@ -27,7 +27,7 @@ #include <linux/io.h> #include <linux/usb/musb-omap.h> #include <linux/usb/phy_companion.h> -#include <linux/usb/omap_usb.h> +#include <linux/phy/omap_usb.h> #include <linux/i2c/twl.h> #include <linux/regulator/consumer.h> #include <linux/err.h> diff --git a/include/linux/usb/omap_usb.h b/include/linux/phy/omap_usb.h similarity index 95% rename from include/linux/usb/omap_usb.h rename to include/linux/phy/omap_usb.h index 6ae2936..19d343c3 100644 --- a/include/linux/usb/omap_usb.h +++ b/include/linux/phy/omap_usb.h @@ -33,13 +33,10 @@ struct usb_dpll_params { struct omap_usb { struct usb_phy phy; struct phy_companion *comparator; - void __iomem *pll_ctrl_base; struct device *dev; struct device *control_dev; struct clk *wkupclk; - struct clk *sys_clk; struct clk *optclk; - u8 is_suspended:1; }; #define phy_to_omapusb(x) container_of((x), struct omap_usb, phy)
No functional change. Moved omap_usb.h from linux/usb/ to linux/phy/. Also removed the unused members of struct omap_usb (after phy-omap-pipe3 started using it's own header file) Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- Changes from v5: fixes the following compilation error drivers/usb/phy/phy-twl6030-usb.c:30:32: fatal error: linux/usb/omap_usb.h: No such file or directory drivers/phy/phy-omap-usb2.c | 2 +- drivers/usb/phy/phy-twl6030-usb.c | 2 +- include/linux/{usb => phy}/omap_usb.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) rename include/linux/{usb => phy}/omap_usb.h (95%)