@@ -23,7 +23,6 @@ struct panel_bridge {
23
23
struct drm_panel * panel ;
24
24
struct device_link * link ;
25
25
u32 connector_type ;
26
- bool is_independent ;
27
26
};
28
27
29
28
static inline struct panel_bridge *
@@ -68,26 +67,20 @@ static int panel_bridge_attach(struct drm_bridge *bridge,
68
67
struct drm_device * drm_dev = bridge -> dev ;
69
68
int ret ;
70
69
71
- panel_bridge -> is_independent = !device_is_dependent (drm_dev -> dev ,
72
- panel -> dev );
73
-
74
- if (panel_bridge -> is_independent ) {
75
- panel_bridge -> link = device_link_add (drm_dev -> dev , panel -> dev ,
76
- DL_FLAG_STATELESS );
77
- if (!panel_bridge -> link ) {
78
- DRM_ERROR ("Failed to add device link between %s and %s\n" ,
79
- dev_name (drm_dev -> dev ), dev_name (panel -> dev ));
80
- return - EINVAL ;
81
- }
70
+ panel_bridge -> link = device_link_add (drm_dev -> dev , panel -> dev ,
71
+ DL_FLAG_STATELESS );
72
+ if (!panel_bridge -> link ) {
73
+ DRM_ERROR ("Failed to add device link between %s and %s\n" ,
74
+ dev_name (drm_dev -> dev ), dev_name (panel -> dev ));
75
+ return - EINVAL ;
82
76
}
83
77
84
78
if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR )
85
79
return 0 ;
86
80
87
81
if (!bridge -> encoder ) {
88
82
DRM_ERROR ("Missing encoder\n" );
89
- if (panel_bridge -> is_independent )
90
- device_link_del (panel_bridge -> link );
83
+ device_link_del (panel_bridge -> link );
91
84
return - ENODEV ;
92
85
}
93
86
@@ -99,8 +92,7 @@ static int panel_bridge_attach(struct drm_bridge *bridge,
99
92
panel_bridge -> connector_type );
100
93
if (ret ) {
101
94
DRM_ERROR ("Failed to initialize connector\n" );
102
- if (panel_bridge -> is_independent )
103
- device_link_del (panel_bridge -> link );
95
+ device_link_del (panel_bridge -> link );
104
96
return ret ;
105
97
}
106
98
@@ -123,8 +115,7 @@ static void panel_bridge_detach(struct drm_bridge *bridge)
123
115
struct panel_bridge * panel_bridge = drm_bridge_to_panel_bridge (bridge );
124
116
struct drm_connector * connector = & panel_bridge -> connector ;
125
117
126
- if (panel_bridge -> is_independent )
127
- device_link_del (panel_bridge -> link );
118
+ device_link_del (panel_bridge -> link );
128
119
129
120
/*
130
121
* Cleanup the connector if we know it was initialized.
0 commit comments