From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Kaehlcke Subject: Re: [PATCH] drm/bridge/synopsis: stop clobbering drvdata Date: Mon, 27 Nov 2017 18:25:46 -0800 Message-ID: <20171128022546.GA58379@google.com> References: <20171128010538.119114-1-briannorris@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20171128010538.119114-1-briannorris@chromium.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Brian Norris Cc: hl@rock-chips.com, linux-rockchip@lists.infradead.org, David Airlie , Philippe Cornu , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yannick Fertre , Nickey Yang , Laurent Pinchart , Vincent Abriou List-Id: linux-rockchip.vger.kernel.org RWwgTW9uLCBOb3YgMjcsIDIwMTcgYXQgMDU6MDU6MzhQTSAtMDgwMCBCcmlhbiBOb3JyaXMgaGEg ZGl0OgoKPiBCcmlkZ2UgZHJpdmVycy9oZWxwZXJzIHNob3VsZG4ndCBiZSBjbG9iYmVyaW5nIHRo ZSBkcnZkYXRhLCBzaW5jZSBhCj4gcGFyZW50IGRyaXZlciBtaWdodCBuZWVkIHRvIG93biB0aGlz LiBJbnN0ZWFkLCBsZXQncyByZXR1cm4gb3VyCj4gJ2R3X21pcGlfZHNpJyBvYmplY3QgYW5kIGhh dmUgY2FsbGVycyBwYXNzIHRoYXQgYmFjayB0byB1cyBmb3IgcmVtb3ZhbC4KPiAKPiBTaWduZWQt b2ZmLWJ5OiBCcmlhbiBOb3JyaXMgPGJyaWFubm9ycmlzQGNocm9taXVtLm9yZz4KPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1taXBpLWRzaS5jIHwgMzYgKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9zdG0vZHdfbWlwaV9kc2kt c3RtLmMgICAgICAgICB8IDE0ICsrKysrKystLS0tCj4gIGluY2x1ZGUvZHJtL2JyaWRnZS9kd19t aXBpX2RzaS5oICAgICAgICAgICAgICB8IDE3ICsrKysrKysrLS0tLS0KPiAgMyBmaWxlcyBjaGFu Z2VkLCAzMyBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1taXBpLWRzaS5jIGIvZHJpdmVycy9n cHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1taXBpLWRzaS5jCj4gaW5kZXggZDljY2E0ZmQ2NmVj Li5jMzljN2RjZTIwZWQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5v cHN5cy9kdy1taXBpLWRzaS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5 cy9kdy1taXBpLWRzaS5jCj4gQEAgLTkyMiw4ICs5MjIsNiBAQCBfX2R3X21pcGlfZHNpX3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsCj4gIAlkc2ktPmJyaWRnZS5vZl9ub2RlID0g cGRldi0+ZGV2Lm9mX25vZGU7Cj4gICNlbmRpZgo+ICAKPiAtCWRldl9zZXRfZHJ2ZGF0YShkZXYs IGRzaSk7Cj4gLQo+ICAJcmV0dXJuIGRzaTsKPiAgfQo+ICAKPiBAQCAtOTM1LDIzICs5MzMsMTYg QEAgc3RhdGljIHZvaWQgX19kd19taXBpX2RzaV9yZW1vdmUoc3RydWN0IGR3X21pcGlfZHNpICpk c2kpCj4gIC8qCj4gICAqIFByb2JlL3JlbW92ZSBBUEksIHVzZWQgZnJvbSBwbGF0Zm9ybXMgYmFz ZWQgb24gdGhlIERSTSBicmlkZ2UgQVBJLgo+ICAgKi8KPiAtaW50IGR3X21pcGlfZHNpX3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsCj4gLQkJICAgICAgY29uc3Qgc3RydWN0IGR3 X21pcGlfZHNpX3BsYXRfZGF0YSAqcGxhdF9kYXRhKQo+ICtzdHJ1Y3QgZHdfbWlwaV9kc2kgKgo+ ICtkd19taXBpX2RzaV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LAo+ICsJCSAg Y29uc3Qgc3RydWN0IGR3X21pcGlfZHNpX3BsYXRfZGF0YSAqcGxhdF9kYXRhKQo+ICB7Cj4gLQlz dHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaTsKPiAtCj4gLQlkc2kgPSBfX2R3X21pcGlfZHNpX3Byb2Jl KHBkZXYsIHBsYXRfZGF0YSk7Cj4gLQlpZiAoSVNfRVJSKGRzaSkpCj4gLQkJcmV0dXJuIFBUUl9F UlIoZHNpKTsKPiAtCj4gLQlyZXR1cm4gMDsKPiArCXJldHVybiBfX2R3X21pcGlfZHNpX3Byb2Jl KHBkZXYsIHBsYXRfZGF0YSk7Cj4gIH0KPiAgRVhQT1JUX1NZTUJPTF9HUEwoZHdfbWlwaV9kc2lf cHJvYmUpOwo+ICAKPiAtdm9pZCBkd19taXBpX2RzaV9yZW1vdmUoc3RydWN0IHBsYXRmb3JtX2Rl dmljZSAqcGRldikKPiArdm9pZCBkd19taXBpX2RzaV9yZW1vdmUoc3RydWN0IGR3X21pcGlfZHNp ICpkc2kpCj4gIHsKPiAtCXN0cnVjdCBkd19taXBpX2RzaSAqZHNpID0gcGxhdGZvcm1fZ2V0X2Ry dmRhdGEocGRldik7Cj4gLQo+ICAJbWlwaV9kc2lfaG9zdF91bnJlZ2lzdGVyKCZkc2ktPmRzaV9o b3N0KTsKPiAgCj4gIAlfX2R3X21pcGlfZHNpX3JlbW92ZShkc2kpOwo+IEBAIC05NjEsMzEgKzk1 MiwzMCBAQCBFWFBPUlRfU1lNQk9MX0dQTChkd19taXBpX2RzaV9yZW1vdmUpOwo+ICAvKgo+ICAg KiBCaW5kL3VuYmluZCBBUEksIHVzZWQgZnJvbSBwbGF0Zm9ybXMgYmFzZWQgb24gdGhlIGNvbXBv bmVudCBmcmFtZXdvcmsuCj4gICAqLwo+IC1pbnQgZHdfbWlwaV9kc2lfYmluZChzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlICpwZGV2LCBzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCj4gLQkJICAg ICBjb25zdCBzdHJ1Y3QgZHdfbWlwaV9kc2lfcGxhdF9kYXRhICpwbGF0X2RhdGEpCj4gK3N0cnVj dCBkd19taXBpX2RzaSAqCj4gK2R3X21pcGlfZHNpX2JpbmQoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldiwgc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAo+ICsJCSBjb25zdCBzdHJ1Y3Qg ZHdfbWlwaV9kc2lfcGxhdF9kYXRhICpwbGF0X2RhdGEpCj4gIHsKPiAgCXN0cnVjdCBkd19taXBp X2RzaSAqZHNpOwo+ICAJaW50IHJldDsKPiAgCj4gIAlkc2kgPSBfX2R3X21pcGlfZHNpX3Byb2Jl KHBkZXYsIHBsYXRfZGF0YSk7Cj4gIAlpZiAoSVNfRVJSKGRzaSkpCj4gLQkJcmV0dXJuIFBUUl9F UlIoZHNpKTsKPiArCQlyZXR1cm4gZHNpOwo+ICAKPiAgCXJldCA9IGRybV9icmlkZ2VfYXR0YWNo KGVuY29kZXIsICZkc2ktPmJyaWRnZSwgTlVMTCk7Cj4gIAlpZiAocmV0KSB7Cj4gLQkJZHdfbWlw aV9kc2lfcmVtb3ZlKHBkZXYpOwo+ICsJCWR3X21pcGlfZHNpX3JlbW92ZShkc2kpOwo+ICAJCURS TV9FUlJPUigiRmFpbGVkIHRvIGluaXRpYWxpemUgYnJpZGdlIHdpdGggZHJtXG4iKTsKPiAtCQly ZXR1cm4gcmV0Owo+ICsJCXJldHVybiBFUlJfUFRSKHJldCk7Cj4gIAl9Cj4gIAo+IC0JcmV0dXJu IDA7Cj4gKwlyZXR1cm4gZHNpOwo+ICB9Cj4gIEVYUE9SVF9TWU1CT0xfR1BMKGR3X21pcGlfZHNp X2JpbmQpOwo+ICAKPiAtdm9pZCBkd19taXBpX2RzaV91bmJpbmQoc3RydWN0IGRldmljZSAqZGV2 KQo+ICt2b2lkIGR3X21pcGlfZHNpX3VuYmluZChzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkKPiAg ewo+IC0Jc3RydWN0IGR3X21pcGlfZHNpICpkc2kgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKPiAt Cj4gIAlfX2R3X21pcGlfZHNpX3JlbW92ZShkc2kpOwo+ICB9Cj4gIEVYUE9SVF9TWU1CT0xfR1BM KGR3X21pcGlfZHNpX3VuYmluZCk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9zdG0v ZHdfbWlwaV9kc2ktc3RtLmMgYi9kcml2ZXJzL2dwdS9kcm0vc3RtL2R3X21pcGlfZHNpLXN0bS5j Cj4gaW5kZXggZTViNjMxMDI0MGZlLi43ZWQwZWY3ZjZlYzIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3N0bS9kd19taXBpX2RzaS1zdG0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9z dG0vZHdfbWlwaV9kc2ktc3RtLmMKPiBAQCAtNjYsNiArNjYsNyBAQCBlbnVtIGRzaV9jb2xvciB7 Cj4gIHN0cnVjdCBkd19taXBpX2RzaV9zdG0gewo+ICAJdm9pZCBfX2lvbWVtICpiYXNlOwo+ICAJ c3RydWN0IGNsayAqcGxscmVmX2NsazsKPiArCXN0cnVjdCBkd19taXBpX2RzaSAqZHNpOwo+ICB9 Owo+ICAKPiAgc3RhdGljIGlubGluZSB2b2lkIGRzaV93cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2lf c3RtICpkc2ksIHUzMiByZWcsIHUzMiB2YWwpCj4gQEAgLTMxOCwyMSArMzE5LDI0IEBAIHN0YXRp YyBpbnQgZHdfbWlwaV9kc2lfc3RtX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYp Cj4gIAlkd19taXBpX2RzaV9zdG1fcGxhdF9kYXRhLmJhc2UgPSBkc2ktPmJhc2U7Cj4gIAlkd19t aXBpX2RzaV9zdG1fcGxhdF9kYXRhLnByaXZfZGF0YSA9IGRzaTsKPiAgCj4gLQlyZXQgPSBkd19t aXBpX2RzaV9wcm9iZShwZGV2LCAmZHdfbWlwaV9kc2lfc3RtX3BsYXRfZGF0YSk7Cj4gLQlpZiAo cmV0KSB7Cj4gKwlwbGF0Zm9ybV9zZXRfZHJ2ZGF0YShwZGV2LCBkc2kpOwo+ICsKPiArCWRzaS0+ ZHNpID0gZHdfbWlwaV9kc2lfcHJvYmUocGRldiwgJmR3X21pcGlfZHNpX3N0bV9wbGF0X2RhdGEp Owo+ICsJaWYgKElTX0VSUihkc2ktPmRzaSkpIHsKPiAgCQlEUk1fRVJST1IoIkZhaWxlZCB0byBp bml0aWFsaXplIG1pcGkgZHNpIGhvc3RcbiIpOwo+ICAJCWNsa19kaXNhYmxlX3VucHJlcGFyZShk c2ktPnBsbHJlZl9jbGspOwo+ICsJCXJldHVybiBQVFJfRVJSKGRzaS0+ZHNpKTsKPiAgCX0KPiAg Cj4gLQlyZXR1cm4gcmV0Owo+ICsJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gIHN0YXRpYyBpbnQgZHdf bWlwaV9kc2lfc3RtX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ICB7Cj4g LQlzdHJ1Y3QgZHdfbWlwaV9kc2lfc3RtICpkc2kgPSBkd19taXBpX2RzaV9zdG1fcGxhdF9kYXRh LnByaXZfZGF0YTsKPiArCXN0cnVjdCBkd19taXBpX2RzaV9zdG0gKmRzaSA9IHBsYXRmb3JtX2dl dF9kcnZkYXRhKHBkZXYpOwo+ICAKPiAgCWNsa19kaXNhYmxlX3VucHJlcGFyZShkc2ktPnBsbHJl Zl9jbGspOwo+IC0JZHdfbWlwaV9kc2lfcmVtb3ZlKHBkZXYpOwo+ICsJZHdfbWlwaV9kc2lfcmVt b3ZlKGRzaS0+ZHNpKTsKPiAgCj4gIAlyZXR1cm4gMDsKPiAgfQo+IGRpZmYgLS1naXQgYS9pbmNs dWRlL2RybS9icmlkZ2UvZHdfbWlwaV9kc2kuaCBiL2luY2x1ZGUvZHJtL2JyaWRnZS9kd19taXBp X2RzaS5oCj4gaW5kZXggOWIzMGZlYzMwMmM4Li5kOWM2ZDU0OWY5NzEgMTAwNjQ0Cj4gLS0tIGEv aW5jbHVkZS9kcm0vYnJpZGdlL2R3X21pcGlfZHNpLmgKPiArKysgYi9pbmNsdWRlL2RybS9icmlk Z2UvZHdfbWlwaV9kc2kuaAo+IEBAIC0xMCw2ICsxMCw4IEBACj4gICNpZm5kZWYgX19EV19NSVBJ X0RTSV9fCj4gICNkZWZpbmUgX19EV19NSVBJX0RTSV9fCj4gIAo+ICtzdHJ1Y3QgZHdfbWlwaV9k c2k7Cj4gKwo+ICBzdHJ1Y3QgZHdfbWlwaV9kc2lfcGh5X29wcyB7Cj4gIAlpbnQgKCppbml0KSh2 b2lkICpwcml2X2RhdGEpOwo+ICAJaW50ICgqZ2V0X2xhbmVfbWJwcykodm9pZCAqcHJpdl9kYXRh LCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKPiBAQCAtMjksMTEgKzMxLDE0IEBAIHN0 cnVjdCBkd19taXBpX2RzaV9wbGF0X2RhdGEgewo+ICAJdm9pZCAqcHJpdl9kYXRhOwo+ICB9Owo+ ICAKPiAtaW50IGR3X21pcGlfZHNpX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYs Cj4gLQkJICAgICAgY29uc3Qgc3RydWN0IGR3X21pcGlfZHNpX3BsYXRfZGF0YSAqcGxhdF9kYXRh KTsKPiAtdm9pZCBkd19taXBpX2RzaV9yZW1vdmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl dik7Cj4gLWludCBkd19taXBpX2RzaV9iaW5kKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYs IHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKPiAtCQkgICAgIGNvbnN0IHN0cnVjdCBkd19t aXBpX2RzaV9wbGF0X2RhdGEgKnBsYXRfZGF0YSk7Cj4gLXZvaWQgZHdfbWlwaV9kc2lfdW5iaW5k KHN0cnVjdCBkZXZpY2UgKmRldik7Cj4gK3N0cnVjdCBkd19taXBpX2RzaSAqZHdfbWlwaV9kc2lf cHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwKPiArCQkJCSAgICAgIGNvbnN0IHN0 cnVjdCBkd19taXBpX2RzaV9wbGF0X2RhdGEKPiArCQkJCSAgICAgICpwbGF0X2RhdGEpOwo+ICt2 b2lkIGR3X21pcGlfZHNpX3JlbW92ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSk7Cj4gK3N0cnVj dCBkd19taXBpX2RzaSAqZHdfbWlwaV9kc2lfYmluZChzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2LAo+ICsJCQkJICAgICBzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCj4gKwkJCQkgICAg IGNvbnN0IHN0cnVjdCBkd19taXBpX2RzaV9wbGF0X2RhdGEKPiArCQkJCSAgICAgKnBsYXRfZGF0 YSk7Cj4gK3ZvaWQgZHdfbWlwaV9kc2lfdW5iaW5kKHN0cnVjdCBkd19taXBpX2RzaSAqZHNpKTsK PiAgCj4gICNlbmRpZiAvKiBfX0RXX01JUElfRFNJX18gKi8KCkkgZG9uJ3QgY2xhaW0gdG8gaGF2 ZSBleHBlcnRpc2UgaW4gdGhpcyBzdWJzeXN0ZW0sIGJ1dCBGV0lXOgoKUmV2aWV3ZWQtYnk6IE1h dHRoaWFzIEthZWhsY2tlIDxta2FAY2hyb21pdW0ub3JnPgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753568AbdK1CZt (ORCPT ); Mon, 27 Nov 2017 21:25:49 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:44916 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753278AbdK1CZs (ORCPT ); Mon, 27 Nov 2017 21:25:48 -0500 X-Google-Smtp-Source: AGs4zMYXwnzy/aPbsVqUe0/IL2/6xDGm2k3xV+Uqc2FFis0O4xcZgBUEJ0zCDvqbtis2wpgP0kS5KA== Date: Mon, 27 Nov 2017 18:25:46 -0800 From: Matthias Kaehlcke To: Brian Norris Cc: Archit Taneja , Andrzej Hajda , Laurent Pinchart , David Airlie , Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Vincent Abriou , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Sean Paul , Nickey Yang , hl@rock-chips.com, linux-rockchip@lists.infradead.org Subject: Re: [PATCH] drm/bridge/synopsis: stop clobbering drvdata Message-ID: <20171128022546.GA58379@google.com> References: <20171128010538.119114-1-briannorris@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20171128010538.119114-1-briannorris@chromium.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org El Mon, Nov 27, 2017 at 05:05:38PM -0800 Brian Norris ha dit: > Bridge drivers/helpers shouldn't be clobbering the drvdata, since a > parent driver might need to own this. Instead, let's return our > 'dw_mipi_dsi' object and have callers pass that back to us for removal. > > Signed-off-by: Brian Norris > --- > drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 36 ++++++++++----------------- > drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 14 +++++++---- > include/drm/bridge/dw_mipi_dsi.h | 17 ++++++++----- > 3 files changed, 33 insertions(+), 34 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > index d9cca4fd66ec..c39c7dce20ed 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > @@ -922,8 +922,6 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, > dsi->bridge.of_node = pdev->dev.of_node; > #endif > > - dev_set_drvdata(dev, dsi); > - > return dsi; > } > > @@ -935,23 +933,16 @@ static void __dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi) > /* > * Probe/remove API, used from platforms based on the DRM bridge API. > */ > -int dw_mipi_dsi_probe(struct platform_device *pdev, > - const struct dw_mipi_dsi_plat_data *plat_data) > +struct dw_mipi_dsi * > +dw_mipi_dsi_probe(struct platform_device *pdev, > + const struct dw_mipi_dsi_plat_data *plat_data) > { > - struct dw_mipi_dsi *dsi; > - > - dsi = __dw_mipi_dsi_probe(pdev, plat_data); > - if (IS_ERR(dsi)) > - return PTR_ERR(dsi); > - > - return 0; > + return __dw_mipi_dsi_probe(pdev, plat_data); > } > EXPORT_SYMBOL_GPL(dw_mipi_dsi_probe); > > -void dw_mipi_dsi_remove(struct platform_device *pdev) > +void dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi) > { > - struct dw_mipi_dsi *dsi = platform_get_drvdata(pdev); > - > mipi_dsi_host_unregister(&dsi->dsi_host); > > __dw_mipi_dsi_remove(dsi); > @@ -961,31 +952,30 @@ EXPORT_SYMBOL_GPL(dw_mipi_dsi_remove); > /* > * Bind/unbind API, used from platforms based on the component framework. > */ > -int dw_mipi_dsi_bind(struct platform_device *pdev, struct drm_encoder *encoder, > - const struct dw_mipi_dsi_plat_data *plat_data) > +struct dw_mipi_dsi * > +dw_mipi_dsi_bind(struct platform_device *pdev, struct drm_encoder *encoder, > + const struct dw_mipi_dsi_plat_data *plat_data) > { > struct dw_mipi_dsi *dsi; > int ret; > > dsi = __dw_mipi_dsi_probe(pdev, plat_data); > if (IS_ERR(dsi)) > - return PTR_ERR(dsi); > + return dsi; > > ret = drm_bridge_attach(encoder, &dsi->bridge, NULL); > if (ret) { > - dw_mipi_dsi_remove(pdev); > + dw_mipi_dsi_remove(dsi); > DRM_ERROR("Failed to initialize bridge with drm\n"); > - return ret; > + return ERR_PTR(ret); > } > > - return 0; > + return dsi; > } > EXPORT_SYMBOL_GPL(dw_mipi_dsi_bind); > > -void dw_mipi_dsi_unbind(struct device *dev) > +void dw_mipi_dsi_unbind(struct dw_mipi_dsi *dsi) > { > - struct dw_mipi_dsi *dsi = dev_get_drvdata(dev); > - > __dw_mipi_dsi_remove(dsi); > } > EXPORT_SYMBOL_GPL(dw_mipi_dsi_unbind); > diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > index e5b6310240fe..7ed0ef7f6ec2 100644 > --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > @@ -66,6 +66,7 @@ enum dsi_color { > struct dw_mipi_dsi_stm { > void __iomem *base; > struct clk *pllref_clk; > + struct dw_mipi_dsi *dsi; > }; > > static inline void dsi_write(struct dw_mipi_dsi_stm *dsi, u32 reg, u32 val) > @@ -318,21 +319,24 @@ static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) > dw_mipi_dsi_stm_plat_data.base = dsi->base; > dw_mipi_dsi_stm_plat_data.priv_data = dsi; > > - ret = dw_mipi_dsi_probe(pdev, &dw_mipi_dsi_stm_plat_data); > - if (ret) { > + platform_set_drvdata(pdev, dsi); > + > + dsi->dsi = dw_mipi_dsi_probe(pdev, &dw_mipi_dsi_stm_plat_data); > + if (IS_ERR(dsi->dsi)) { > DRM_ERROR("Failed to initialize mipi dsi host\n"); > clk_disable_unprepare(dsi->pllref_clk); > + return PTR_ERR(dsi->dsi); > } > > - return ret; > + return 0; > } > > static int dw_mipi_dsi_stm_remove(struct platform_device *pdev) > { > - struct dw_mipi_dsi_stm *dsi = dw_mipi_dsi_stm_plat_data.priv_data; > + struct dw_mipi_dsi_stm *dsi = platform_get_drvdata(pdev); > > clk_disable_unprepare(dsi->pllref_clk); > - dw_mipi_dsi_remove(pdev); > + dw_mipi_dsi_remove(dsi->dsi); > > return 0; > } > diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h > index 9b30fec302c8..d9c6d549f971 100644 > --- a/include/drm/bridge/dw_mipi_dsi.h > +++ b/include/drm/bridge/dw_mipi_dsi.h > @@ -10,6 +10,8 @@ > #ifndef __DW_MIPI_DSI__ > #define __DW_MIPI_DSI__ > > +struct dw_mipi_dsi; > + > struct dw_mipi_dsi_phy_ops { > int (*init)(void *priv_data); > int (*get_lane_mbps)(void *priv_data, struct drm_display_mode *mode, > @@ -29,11 +31,14 @@ struct dw_mipi_dsi_plat_data { > void *priv_data; > }; > > -int dw_mipi_dsi_probe(struct platform_device *pdev, > - const struct dw_mipi_dsi_plat_data *plat_data); > -void dw_mipi_dsi_remove(struct platform_device *pdev); > -int dw_mipi_dsi_bind(struct platform_device *pdev, struct drm_encoder *encoder, > - const struct dw_mipi_dsi_plat_data *plat_data); > -void dw_mipi_dsi_unbind(struct device *dev); > +struct dw_mipi_dsi *dw_mipi_dsi_probe(struct platform_device *pdev, > + const struct dw_mipi_dsi_plat_data > + *plat_data); > +void dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi); > +struct dw_mipi_dsi *dw_mipi_dsi_bind(struct platform_device *pdev, > + struct drm_encoder *encoder, > + const struct dw_mipi_dsi_plat_data > + *plat_data); > +void dw_mipi_dsi_unbind(struct dw_mipi_dsi *dsi); > > #endif /* __DW_MIPI_DSI__ */ I don't claim to have expertise in this subsystem, but FWIW: Reviewed-by: Matthias Kaehlcke