| Message ID | 1548816751-32068-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 3c8d7ef89bb8bd7d00910fa14d4dab14a8e0cf5a |
| Headers | show |
| Series | vfio: platform: reset: fix up include directives to remove ccflags-y | expand |
Hi Masahiro, On 1/30/19 3:52 AM, Masahiro Yamada wrote: > For the include directive with double-quotes "", the preprocessor > searches the header in the relative path to the current file. > > Fix them up, and remove the header search path option. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > > drivers/vfio/platform/reset/Makefile | 2 -- > drivers/vfio/platform/reset/vfio_platform_amdxgbe.c | 2 +- > drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c | 2 +- > drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c | 2 +- > 4 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/vfio/platform/reset/Makefile b/drivers/vfio/platform/reset/Makefile > index 57abd4f..7294c5e 100644 > --- a/drivers/vfio/platform/reset/Makefile > +++ b/drivers/vfio/platform/reset/Makefile > @@ -2,8 +2,6 @@ > vfio-platform-calxedaxgmac-y := vfio_platform_calxedaxgmac.o > vfio-platform-amdxgbe-y := vfio_platform_amdxgbe.o > > -ccflags-y += -Idrivers/vfio/platform > - > obj-$(CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET) += vfio-platform-calxedaxgmac.o > obj-$(CONFIG_VFIO_PLATFORM_AMDXGBE_RESET) += vfio-platform-amdxgbe.o > obj-$(CONFIG_VFIO_PLATFORM_BCMFLEXRM_RESET) += vfio_platform_bcmflexrm.o > diff --git a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c > index bcd419c..3ddb270 100644 > --- a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c > +++ b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c > @@ -25,7 +25,7 @@ > #include <uapi/linux/mdio.h> > #include <linux/delay.h> > > -#include "vfio_platform_private.h" > +#include "../vfio_platform_private.h" > > #define DMA_MR 0x3000 > #define MAC_VR 0x0110 > diff --git a/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c > index d45c3be..16165a6 100644 > --- a/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c > +++ b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c > @@ -23,7 +23,7 @@ > #include <linux/kernel.h> > #include <linux/module.h> > > -#include "vfio_platform_private.h" > +#include "../vfio_platform_private.h" > > /* FlexRM configuration */ > #define RING_REGS_SIZE 0x10000 > diff --git a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c > index 49e5df6..e0356de 100644 > --- a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c > +++ b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c > @@ -24,7 +24,7 @@ > #include <linux/init.h> > #include <linux/io.h> > > -#include "vfio_platform_private.h" > +#include "../vfio_platform_private.h" > > #define DRIVER_VERSION "0.1" > #define DRIVER_AUTHOR "Eric Auger <eric.auger@linaro.org>" >
On Wed, 30 Jan 2019 11:52:31 +0900 Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > For the include directive with double-quotes "", the preprocessor > searches the header in the relative path to the current file. > > Fix them up, and remove the header search path option. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > drivers/vfio/platform/reset/Makefile | 2 -- > drivers/vfio/platform/reset/vfio_platform_amdxgbe.c | 2 +- > drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c | 2 +- > drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c | 2 +- > 4 files changed, 3 insertions(+), 5 deletions(-) Applied with Eric's Ack to the vfio next branch for v5.1. Thanks, Alex > diff --git a/drivers/vfio/platform/reset/Makefile b/drivers/vfio/platform/reset/Makefile > index 57abd4f..7294c5e 100644 > --- a/drivers/vfio/platform/reset/Makefile > +++ b/drivers/vfio/platform/reset/Makefile > @@ -2,8 +2,6 @@ > vfio-platform-calxedaxgmac-y := vfio_platform_calxedaxgmac.o > vfio-platform-amdxgbe-y := vfio_platform_amdxgbe.o > > -ccflags-y += -Idrivers/vfio/platform > - > obj-$(CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET) += vfio-platform-calxedaxgmac.o > obj-$(CONFIG_VFIO_PLATFORM_AMDXGBE_RESET) += vfio-platform-amdxgbe.o > obj-$(CONFIG_VFIO_PLATFORM_BCMFLEXRM_RESET) += vfio_platform_bcmflexrm.o > diff --git a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c > index bcd419c..3ddb270 100644 > --- a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c > +++ b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c > @@ -25,7 +25,7 @@ > #include <uapi/linux/mdio.h> > #include <linux/delay.h> > > -#include "vfio_platform_private.h" > +#include "../vfio_platform_private.h" > > #define DMA_MR 0x3000 > #define MAC_VR 0x0110 > diff --git a/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c > index d45c3be..16165a6 100644 > --- a/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c > +++ b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c > @@ -23,7 +23,7 @@ > #include <linux/kernel.h> > #include <linux/module.h> > > -#include "vfio_platform_private.h" > +#include "../vfio_platform_private.h" > > /* FlexRM configuration */ > #define RING_REGS_SIZE 0x10000 > diff --git a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c > index 49e5df6..e0356de 100644 > --- a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c > +++ b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c > @@ -24,7 +24,7 @@ > #include <linux/init.h> > #include <linux/io.h> > > -#include "vfio_platform_private.h" > +#include "../vfio_platform_private.h" > > #define DRIVER_VERSION "0.1" > #define DRIVER_AUTHOR "Eric Auger <eric.auger@linaro.org>"
diff --git a/drivers/vfio/platform/reset/Makefile b/drivers/vfio/platform/reset/Makefile index 57abd4f..7294c5e 100644 --- a/drivers/vfio/platform/reset/Makefile +++ b/drivers/vfio/platform/reset/Makefile @@ -2,8 +2,6 @@ vfio-platform-calxedaxgmac-y := vfio_platform_calxedaxgmac.o vfio-platform-amdxgbe-y := vfio_platform_amdxgbe.o -ccflags-y += -Idrivers/vfio/platform - obj-$(CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET) += vfio-platform-calxedaxgmac.o obj-$(CONFIG_VFIO_PLATFORM_AMDXGBE_RESET) += vfio-platform-amdxgbe.o obj-$(CONFIG_VFIO_PLATFORM_BCMFLEXRM_RESET) += vfio_platform_bcmflexrm.o diff --git a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c index bcd419c..3ddb270 100644 --- a/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c +++ b/drivers/vfio/platform/reset/vfio_platform_amdxgbe.c @@ -25,7 +25,7 @@ #include <uapi/linux/mdio.h> #include <linux/delay.h> -#include "vfio_platform_private.h" +#include "../vfio_platform_private.h" #define DMA_MR 0x3000 #define MAC_VR 0x0110 diff --git a/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c index d45c3be..16165a6 100644 --- a/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c +++ b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c @@ -23,7 +23,7 @@ #include <linux/kernel.h> #include <linux/module.h> -#include "vfio_platform_private.h" +#include "../vfio_platform_private.h" /* FlexRM configuration */ #define RING_REGS_SIZE 0x10000 diff --git a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c index 49e5df6..e0356de 100644 --- a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c +++ b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c @@ -24,7 +24,7 @@ #include <linux/init.h> #include <linux/io.h> -#include "vfio_platform_private.h" +#include "../vfio_platform_private.h" #define DRIVER_VERSION "0.1" #define DRIVER_AUTHOR "Eric Auger <eric.auger@linaro.org>"
For the include directive with double-quotes "", the preprocessor searches the header in the relative path to the current file. Fix them up, and remove the header search path option. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/vfio/platform/reset/Makefile | 2 -- drivers/vfio/platform/reset/vfio_platform_amdxgbe.c | 2 +- drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c | 2 +- drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) -- 2.7.4