| Message ID | 20210306110525.216316-1-zhang.yunkai@zte.com.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: remove duplicate include in dcn21 and gpio | expand |
Applied. Thanks! Alex On Sat, Mar 6, 2021 at 6:05 AM <menglong8.dong@gmail.com> wrote: > > From: Zhang Yunkai <zhang.yunkai@zte.com.cn> > > 'dce110_resource.h' included in 'dcn21_resource.c' is duplicated. > 'hw_gpio.h' included in 'hw_factory_dce110.c' is duplicated. > > Signed-off-by: Zhang Yunkai <zhang.yunkai@zte.com.cn> > --- > drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 - > .../gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c | 4 ---- > 2 files changed, 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c > index 072f8c880924..8a6a965751e8 100644 > --- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c > +++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c > @@ -61,7 +61,6 @@ > #include "dcn21/dcn21_dccg.h" > #include "dcn21_hubbub.h" > #include "dcn10/dcn10_resource.h" > -#include "dce110/dce110_resource.h" > #include "dce/dce_panel_cntl.h" > > #include "dcn20/dcn20_dwb.h" > diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c b/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c > index 66e4841f41e4..ca335ea60412 100644 > --- a/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c > +++ b/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c > @@ -48,10 +48,6 @@ > #define REGI(reg_name, block, id)\ > mm ## block ## id ## _ ## reg_name > > -#include "../hw_gpio.h" > -#include "../hw_ddc.h" > -#include "../hw_hpd.h" > - > #include "reg_helper.h" > #include "../hpd_regs.h" > > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c index 072f8c880924..8a6a965751e8 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c @@ -61,7 +61,6 @@ #include "dcn21/dcn21_dccg.h" #include "dcn21_hubbub.h" #include "dcn10/dcn10_resource.h" -#include "dce110/dce110_resource.h" #include "dce/dce_panel_cntl.h" #include "dcn20/dcn20_dwb.h" diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c b/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c index 66e4841f41e4..ca335ea60412 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c @@ -48,10 +48,6 @@ #define REGI(reg_name, block, id)\ mm ## block ## id ## _ ## reg_name -#include "../hw_gpio.h" -#include "../hw_ddc.h" -#include "../hw_hpd.h" - #include "reg_helper.h" #include "../hpd_regs.h"