From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: dmaengine: remove DBGFS_FUNC_DECL() From: Yangtao Li Message-Id: <20181130154249.3222-1-tiny.windzz@gmail.com> Date: Fri, 30 Nov 2018 10:42:49 -0500 To: dan.j.williams@intel.com, vkoul@kernel.org, sudeep.dutt@intel.com, ashutosh.dixit@intel.com, daniel@zonque.org, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, okaya@kernel.org, andy.gross@linaro.org, david.brown@linaro.org Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, Yangtao Li List-ID: V2UgYWxyZWFkeSBoYXZlIHRoZSBERUZJTkVfU0hPV19BVFRSSUJVVEUsVGhlcmUgaXMgbm8gbmVl ZCB0byBkZWZpbmUKc3VjaCBhIG1hY3JvLHNvIHJlbW92ZSBEQkdGU19GVU5DX0RFQ0wuQWxzbyB1 c2UgbWFjcm8gdG8gc2ltcGxpZnkgc29tZQpjb2RlLgoKU2lnbmVkLW9mZi1ieTogWWFuZ3RhbyBM aSA8dGlueS53aW5kenpAZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZG1hL2FtYmEtcGwwOHguYyAg ICAgfCAxNCArKy0tLS0tLS0tLS0tLQogZHJpdmVycy9kbWEvbWljX3gxMDBfZG1hLmMgICB8IDIy ICsrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZG1hL3B4YV9kbWEuYyAgICAgICAgfCAy NCArKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZG1hL3Fjb20vaGlkbWFfZGJnLmMg fCAzMyArKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwg MjMgaW5zZXJ0aW9ucygrKSwgNzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9k bWEvYW1iYS1wbDA4eC5jIGIvZHJpdmVycy9kbWEvYW1iYS1wbDA4eC5jCmluZGV4IDk3NDgzZGYx ZjgyZS4uZmM4YzJiYWI1NjNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2RtYS9hbWJhLXBsMDh4LmMK KysrIGIvZHJpdmVycy9kbWEvYW1iYS1wbDA4eC5jCkBAIC0yNTA1LDI0ICsyNTA1LDE0IEBAIHN0 YXRpYyBpbnQgcGwwOHhfZGVidWdmc19zaG93KHN0cnVjdCBzZXFfZmlsZSAqcywgdm9pZCAqZGF0 YSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBwbDA4eF9kZWJ1Z2ZzX29wZW4oc3RydWN0 IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZpbGUpCi17Ci0JcmV0dXJuIHNpbmdsZV9vcGVu KGZpbGUsIHBsMDh4X2RlYnVnZnNfc2hvdywgaW5vZGUtPmlfcHJpdmF0ZSk7Ci19Ci0KLXN0YXRp YyBjb25zdCBzdHJ1Y3QgZmlsZV9vcGVyYXRpb25zIHBsMDh4X2RlYnVnZnNfb3BlcmF0aW9ucyA9 IHsKLQkub3BlbgkJPSBwbDA4eF9kZWJ1Z2ZzX29wZW4sCi0JLnJlYWQJCT0gc2VxX3JlYWQsCi0J Lmxsc2VlawkJPSBzZXFfbHNlZWssCi0JLnJlbGVhc2UJPSBzaW5nbGVfcmVsZWFzZSwKLX07CitE RUZJTkVfU0hPV19BVFRSSUJVVEUocGwwOHhfZGVidWdmcyk7CiAKIHN0YXRpYyB2b2lkIGluaXRf cGwwOHhfZGVidWdmcyhzdHJ1Y3QgcGwwOHhfZHJpdmVyX2RhdGEgKnBsMDh4KQogewogCS8qIEV4 cG9zZSBhIHNpbXBsZSBkZWJ1Z2ZzIGludGVyZmFjZSB0byB2aWV3IGFsbCBjbG9ja3MgKi8KIAko dm9pZCkgZGVidWdmc19jcmVhdGVfZmlsZShkZXZfbmFtZSgmcGwwOHgtPmFkZXYtPmRldiksCiAJ CQlTX0lGUkVHIHwgU19JUlVHTywgTlVMTCwgcGwwOHgsCi0JCQkmcGwwOHhfZGVidWdmc19vcGVy YXRpb25zKTsKKwkJCSZwbDA4eF9kZWJ1Z2ZzX2ZvcHMpOwogfQogCiAjZWxzZQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9kbWEvbWljX3gxMDBfZG1hLmMgYi9kcml2ZXJzL2RtYS9taWNfeDEwMF9kbWEu YwppbmRleCBhZGZkMzE2ZGIxYTguLjZhOTFlMjhkNTM3ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9k bWEvbWljX3gxMDBfZG1hLmMKKysrIGIvZHJpdmVycy9kbWEvbWljX3gxMDBfZG1hLmMKQEAgLTY3 Niw3ICs2NzYsNyBAQCBzdGF0aWMgdm9pZCBtaWNfZG1hX2Rldl91bnJlZyhzdHJ1Y3QgbWljX2Rt YV9kZXZpY2UgKm1pY19kbWFfZGV2KQogfQogCiAvKiBERUJVR0ZTIENPREUgKi8KLXN0YXRpYyBp bnQgbWljX2RtYV9yZWdfc2VxX3Nob3coc3RydWN0IHNlcV9maWxlICpzLCB2b2lkICpwb3MpCitz dGF0aWMgaW50IG1pY19kbWFfcmVnX3Nob3coc3RydWN0IHNlcV9maWxlICpzLCB2b2lkICpwb3Mp CiB7CiAJc3RydWN0IG1pY19kbWFfZGV2aWNlICptaWNfZG1hX2RldiA9IHMtPnByaXZhdGU7CiAJ aW50IGksIGNoYW5fbnVtLCBmaXJzdF9jaGFuID0gbWljX2RtYV9kZXYtPnN0YXJ0X2NoOwpAQCAt NzA3LDIzICs3MDcsNyBAQCBzdGF0aWMgaW50IG1pY19kbWFfcmVnX3NlcV9zaG93KHN0cnVjdCBz ZXFfZmlsZSAqcywgdm9pZCAqcG9zKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IG1pY19k bWFfcmVnX2RlYnVnX29wZW4oc3RydWN0IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZpbGUp Ci17Ci0JcmV0dXJuIHNpbmdsZV9vcGVuKGZpbGUsIG1pY19kbWFfcmVnX3NlcV9zaG93LCBpbm9k ZS0+aV9wcml2YXRlKTsKLX0KLQotc3RhdGljIGludCBtaWNfZG1hX3JlZ19kZWJ1Z19yZWxlYXNl KHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpmaWxlKQotewotCXJldHVybiBzaW5n bGVfcmVsZWFzZShpbm9kZSwgZmlsZSk7Ci19Ci0KLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZmlsZV9v cGVyYXRpb25zIG1pY19kbWFfcmVnX29wcyA9IHsKLQkub3duZXIgICA9IFRISVNfTU9EVUxFLAot CS5vcGVuICAgID0gbWljX2RtYV9yZWdfZGVidWdfb3BlbiwKLQkucmVhZCAgICA9IHNlcV9yZWFk LAotCS5sbHNlZWsgID0gc2VxX2xzZWVrLAotCS5yZWxlYXNlID0gbWljX2RtYV9yZWdfZGVidWdf cmVsZWFzZQotfTsKK0RFRklORV9TSE9XX0FUVFJJQlVURShtaWNfZG1hX3JlZyk7CiAKIC8qIERl YnVnZnMgcGFyZW50IGRpciAqLwogc3RhdGljIHN0cnVjdCBkZW50cnkgKm1pY19kbWFfZGJnOwpA QCAtNzQ3LDcgKzczMSw3IEBAIHN0YXRpYyBpbnQgbWljX2RtYV9kcml2ZXJfcHJvYmUoc3RydWN0 IG1idXNfZGV2aWNlICptYmRldikKIAkJaWYgKG1pY19kbWFfZGV2LT5kYmdfZGlyKQogCQkJZGVi dWdmc19jcmVhdGVfZmlsZSgibWljX2RtYV9yZWciLCAwNDQ0LAogCQkJCQkgICAgbWljX2RtYV9k ZXYtPmRiZ19kaXIsIG1pY19kbWFfZGV2LAotCQkJCQkgICAgJm1pY19kbWFfcmVnX29wcyk7CisJ CQkJCSAgICAmbWljX2RtYV9yZWdfZm9wcyk7CiAJfQogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9kbWEvcHhhX2RtYS5jIGIvZHJpdmVycy9kbWEvcHhhX2RtYS5jCmluZGV4IDgy NTcyNTA1N2UwMC4uOGUxZTFiMDdkMzJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2RtYS9weGFfZG1h LmMKKysrIGIvZHJpdmVycy9kbWEvcHhhX2RtYS5jCkBAIC0xODksNyArMTg5LDcgQEAgYm9vbCBw eGFkX2ZpbHRlcl9mbihzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sIHZvaWQgKnBhcmFtKTsKICNpbmNs dWRlIDxsaW51eC91YWNjZXNzLmg+CiAjaW5jbHVkZSA8bGludXgvc2VxX2ZpbGUuaD4KIAotc3Rh dGljIGludCBkYmdfc2hvd19yZXF1ZXN0ZXJfY2hhbihzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQg KnApCitzdGF0aWMgaW50IHJlcXVlc3Rlcl9jaGFuX3Nob3coc3RydWN0IHNlcV9maWxlICpzLCB2 b2lkICpwKQogewogCXN0cnVjdCBweGFkX3BoeSAqcGh5ID0gcy0+cHJpdmF0ZTsKIAlpbnQgaTsK QEAgLTIyMCw3ICsyMjAsNyBAQCBzdGF0aWMgaW50IGlzX3BoeXNfdmFsaWQodW5zaWduZWQgbG9u ZyBhZGRyKQogI2RlZmluZSBQWEFfRENTUl9TVFIoZmxhZykgKGRjc3IgJiBQWEFfRENTUl8jI2Zs YWcgPyAjZmxhZyIgIiA6ICIiKQogI2RlZmluZSBQWEFfRENNRF9TVFIoZmxhZykgKGRjbWQgJiBQ WEFfRENNRF8jI2ZsYWcgPyAjZmxhZyIgIiA6ICIiKQogCi1zdGF0aWMgaW50IGRiZ19zaG93X2Rl c2NyaXB0b3JzKHN0cnVjdCBzZXFfZmlsZSAqcywgdm9pZCAqcCkKK3N0YXRpYyBpbnQgZGVzY3Jp cHRvcnNfc2hvdyhzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQgKnApCiB7CiAJc3RydWN0IHB4YWRf cGh5ICpwaHkgPSBzLT5wcml2YXRlOwogCWludCBpLCBtYXhfc2hvdyA9IDIwLCBidXJzdCwgd2lk dGg7CkBAIC0yNjMsNyArMjYzLDcgQEAgc3RhdGljIGludCBkYmdfc2hvd19kZXNjcmlwdG9ycyhz dHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQgKnApCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQg ZGJnX3Nob3dfY2hhbl9zdGF0ZShzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQgKnApCitzdGF0aWMg aW50IGNoYW5fc3RhdGVfc2hvdyhzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQgKnApCiB7CiAJc3Ry dWN0IHB4YWRfcGh5ICpwaHkgPSBzLT5wcml2YXRlOwogCXUzMiBkY3NyLCBkY21kOwpAQCAtMzA2 LDcgKzMwNiw3IEBAIHN0YXRpYyBpbnQgZGJnX3Nob3dfY2hhbl9zdGF0ZShzdHJ1Y3Qgc2VxX2Zp bGUgKnMsIHZvaWQgKnApCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgZGJnX3Nob3dfc3Rh dGUoc3RydWN0IHNlcV9maWxlICpzLCB2b2lkICpwKQorc3RhdGljIGludCBzdGF0ZV9zaG93KHN0 cnVjdCBzZXFfZmlsZSAqcywgdm9pZCAqcCkKIHsKIAlzdHJ1Y3QgcHhhZF9kZXZpY2UgKnBkZXYg PSBzLT5wcml2YXRlOwogCkBAIC0zMjksMTAgKzMyOSwxMCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0 IGZpbGVfb3BlcmF0aW9ucyBkYmdfZm9wc18jI25hbWUgPSB7IFwKIAkucmVsZWFzZQk9IHNpbmds ZV9yZWxlYXNlLCBcCiB9CiAKLURCR0ZTX0ZVTkNfREVDTChzdGF0ZSk7Ci1EQkdGU19GVU5DX0RF Q0woY2hhbl9zdGF0ZSk7Ci1EQkdGU19GVU5DX0RFQ0woZGVzY3JpcHRvcnMpOwotREJHRlNfRlVO Q19ERUNMKHJlcXVlc3Rlcl9jaGFuKTsKK0RFRklORV9TSE9XX0FUVFJJQlVURShzdGF0ZSk7CitE RUZJTkVfU0hPV19BVFRSSUJVVEUoY2hhbl9zdGF0ZSk7CitERUZJTkVfU0hPV19BVFRSSUJVVEUo ZGVzY3JpcHRvcnMpOworREVGSU5FX1NIT1dfQVRUUklCVVRFKHJlcXVlc3Rlcl9jaGFuKTsKIAog c3RhdGljIHN0cnVjdCBkZW50cnkgKnB4YWRfZGJnX2FsbG9jX2NoYW4oc3RydWN0IHB4YWRfZGV2 aWNlICpwZGV2LAogCQkJCQkgICAgIGludCBjaCwgc3RydWN0IGRlbnRyeSAqY2hhbmRpcikKQEAg LTM0OCwxMyArMzQ4LDEzIEBAIHN0YXRpYyBzdHJ1Y3QgZGVudHJ5ICpweGFkX2RiZ19hbGxvY19j aGFuKHN0cnVjdCBweGFkX2RldmljZSAqcGRldiwKIAogCWlmIChjaGFuKQogCQljaGFuX3N0YXRl ID0gZGVidWdmc19jcmVhdGVfZmlsZSgic3RhdGUiLCAwNDAwLCBjaGFuLCBkdCwKLQkJCQkJCSAm ZGJnX2ZvcHNfY2hhbl9zdGF0ZSk7CisJCQkJCQkgJmNoYW5fc3RhdGVfZm9wcyk7CiAJaWYgKGNo YW5fc3RhdGUpCiAJCWNoYW5fZGVzY3IgPSBkZWJ1Z2ZzX2NyZWF0ZV9maWxlKCJkZXNjcmlwdG9y cyIsIDA0MDAsIGNoYW4sIGR0LAotCQkJCQkJICZkYmdfZm9wc19kZXNjcmlwdG9ycyk7CisJCQkJ CQkgJmRlc2NyaXB0b3JzX2ZvcHMpOwogCWlmIChjaGFuX2Rlc2NyKQogCQljaGFuX3JlcXMgPSBk ZWJ1Z2ZzX2NyZWF0ZV9maWxlKCJyZXF1ZXN0ZXJzIiwgMDQwMCwgY2hhbiwgZHQsCi0JCQkJCQkm ZGJnX2ZvcHNfcmVxdWVzdGVyX2NoYW4pOworCQkJCQkJJnJlcXVlc3Rlcl9jaGFuX2ZvcHMpOwog CWlmICghY2hhbl9yZXFzKQogCQlnb3RvIGVycl9zdGF0ZTsKIApAQCAtMzc1LDcgKzM3NSw3IEBA IHN0YXRpYyB2b2lkIHB4YWRfaW5pdF9kZWJ1Z2ZzKHN0cnVjdCBweGFkX2RldmljZSAqcGRldikK IAkJZ290byBlcnJfcm9vdDsKIAogCXBkZXYtPmRiZ2ZzX3N0YXRlID0gZGVidWdmc19jcmVhdGVf ZmlsZSgic3RhdGUiLCAwNDAwLCBwZGV2LT5kYmdmc19yb290LAotCQkJCQkJcGRldiwgJmRiZ19m b3BzX3N0YXRlKTsKKwkJCQkJCXBkZXYsICZzdGF0ZV9mb3BzKTsKIAlpZiAoIXBkZXYtPmRiZ2Zz X3N0YXRlKQogCQlnb3RvIGVycl9zdGF0ZTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9kbWEvcWNv bS9oaWRtYV9kYmcuYyBiL2RyaXZlcnMvZG1hL3Fjb20vaGlkbWFfZGJnLmMKaW5kZXggM2JkY2I4 MDU2YTM2Li45NTIzZmFmN2FjZGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hL3Fjb20vaGlkbWFf ZGJnLmMKKysrIGIvZHJpdmVycy9kbWEvcWNvbS9oaWRtYV9kYmcuYwpAQCAtODUsMTEgKzg1LDEx IEBAIHN0YXRpYyB2b2lkIGhpZG1hX2xsX2RldnN0YXRzKHN0cnVjdCBzZXFfZmlsZSAqcywgdm9p ZCAqbGxobmRsKQogfQogCiAvKgotICogaGlkbWFfY2hhbl9zdGF0czogZGlzcGxheSBISURNQSBj aGFubmVsIHN0YXRpc3RpY3MKKyAqIGhpZG1hX2NoYW5fc2hvdzogZGlzcGxheSBISURNQSBjaGFu bmVsIHN0YXRpc3RpY3MKICAqCiAgKiBEaXNwbGF5IHRoZSBzdGF0aXN0aWNzIGZvciB0aGUgY3Vy cmVudCBISURNQSB2aXJ0dWFsIGNoYW5uZWwgZGV2aWNlLgogICovCi1zdGF0aWMgaW50IGhpZG1h X2NoYW5fc3RhdHMoc3RydWN0IHNlcV9maWxlICpzLCB2b2lkICp1bnVzZWQpCitzdGF0aWMgaW50 IGhpZG1hX2NoYW5fc2hvdyhzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQgKnVudXNlZCkKIHsKIAlz dHJ1Y3QgaGlkbWFfY2hhbiAqbWNoYW4gPSBzLT5wcml2YXRlOwogCXN0cnVjdCBoaWRtYV9kZXNj ICptZGVzYzsKQEAgLTExNywxMSArMTE3LDExIEBAIHN0YXRpYyBpbnQgaGlkbWFfY2hhbl9zdGF0 cyhzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQgKnVudXNlZCkKIH0KIAogLyoKLSAqIGhpZG1hX2Rt YV9pbmZvOiBkaXNwbGF5IEhJRE1BIGRldmljZSBpbmZvCisgKiBoaWRtYV9kbWFfc2hvdzogZGlz cGxheSBISURNQSBkZXZpY2UgaW5mbwogICoKICAqIERpc3BsYXkgdGhlIGluZm8gZm9yIHRoZSBj dXJyZW50IEhJRE1BIGRldmljZS4KICAqLwotc3RhdGljIGludCBoaWRtYV9kbWFfaW5mbyhzdHJ1 Y3Qgc2VxX2ZpbGUgKnMsIHZvaWQgKnVudXNlZCkKK3N0YXRpYyBpbnQgaGlkbWFfZG1hX3Nob3co c3RydWN0IHNlcV9maWxlICpzLCB2b2lkICp1bnVzZWQpCiB7CiAJc3RydWN0IGhpZG1hX2RldiAq ZG1hZGV2ID0gcy0+cHJpdmF0ZTsKIAlyZXNvdXJjZV9zaXplX3Qgc3o7CkBAIC0xMzgsMjkgKzEz OCw4IEBAIHN0YXRpYyBpbnQgaGlkbWFfZG1hX2luZm8oc3RydWN0IHNlcV9maWxlICpzLCB2b2lk ICp1bnVzZWQpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaGlkbWFfY2hhbl9zdGF0c19v cGVuKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpmaWxlKQotewotCXJldHVybiBz aW5nbGVfb3BlbihmaWxlLCBoaWRtYV9jaGFuX3N0YXRzLCBpbm9kZS0+aV9wcml2YXRlKTsKLX0K LQotc3RhdGljIGludCBoaWRtYV9kbWFfaW5mb19vcGVuKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0 cnVjdCBmaWxlICpmaWxlKQotewotCXJldHVybiBzaW5nbGVfb3BlbihmaWxlLCBoaWRtYV9kbWFf aW5mbywgaW5vZGUtPmlfcHJpdmF0ZSk7Ci19Ci0KLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZmlsZV9v cGVyYXRpb25zIGhpZG1hX2NoYW5fZm9wcyA9IHsKLQkub3BlbiA9IGhpZG1hX2NoYW5fc3RhdHNf b3BlbiwKLQkucmVhZCA9IHNlcV9yZWFkLAotCS5sbHNlZWsgPSBzZXFfbHNlZWssCi0JLnJlbGVh c2UgPSBzaW5nbGVfcmVsZWFzZSwKLX07Ci0KLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZmlsZV9vcGVy YXRpb25zIGhpZG1hX2RtYV9mb3BzID0gewotCS5vcGVuID0gaGlkbWFfZG1hX2luZm9fb3BlbiwK LQkucmVhZCA9IHNlcV9yZWFkLAotCS5sbHNlZWsgPSBzZXFfbHNlZWssCi0JLnJlbGVhc2UgPSBz aW5nbGVfcmVsZWFzZSwKLX07CitERUZJTkVfU0hPV19BVFRSSUJVVEUoaGlkbWFfY2hhbik7CitE RUZJTkVfU0hPV19BVFRSSUJVVEUoaGlkbWFfZG1hKTsKIAogdm9pZCBoaWRtYV9kZWJ1Z191bmlu aXQoc3RydWN0IGhpZG1hX2RldiAqZG1hZGV2KQogewo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yangtao Li Subject: [PATCH] dmaengine: remove DBGFS_FUNC_DECL() Date: Fri, 30 Nov 2018 10:42:49 -0500 Message-ID: <20181130154249.3222-1-tiny.windzz@gmail.com> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: dan.j.williams@intel.com, vkoul@kernel.org, sudeep.dutt@intel.com, ashutosh.dixit@intel.com, daniel@zonque.org, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, okaya@kernel.org, andy.gross@linaro.org, david.brown@linaro.org Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, Yangtao Li List-Id: linux-arm-msm@vger.kernel.org We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code. Signed-off-by: Yangtao Li --- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++--------------------------- 4 files changed, 23 insertions(+), 70 deletions(-) diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 97483df1f82e..fc8c2bab563c 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -2505,24 +2505,14 @@ static int pl08x_debugfs_show(struct seq_file *s, void *data) return 0; } -static int pl08x_debugfs_open(struct inode *inode, struct file *file) -{ - return single_open(file, pl08x_debugfs_show, inode->i_private); -} - -static const struct file_operations pl08x_debugfs_operations = { - .open = pl08x_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(pl08x_debugfs); static void init_pl08x_debugfs(struct pl08x_driver_data *pl08x) { /* Expose a simple debugfs interface to view all clocks */ (void) debugfs_create_file(dev_name(&pl08x->adev->dev), S_IFREG | S_IRUGO, NULL, pl08x, - &pl08x_debugfs_operations); + &pl08x_debugfs_fops); } #else diff --git a/drivers/dma/mic_x100_dma.c b/drivers/dma/mic_x100_dma.c index adfd316db1a8..6a91e28d537d 100644 --- a/drivers/dma/mic_x100_dma.c +++ b/drivers/dma/mic_x100_dma.c @@ -676,7 +676,7 @@ static void mic_dma_dev_unreg(struct mic_dma_device *mic_dma_dev) } /* DEBUGFS CODE */ -static int mic_dma_reg_seq_show(struct seq_file *s, void *pos) +static int mic_dma_reg_show(struct seq_file *s, void *pos) { struct mic_dma_device *mic_dma_dev = s->private; int i, chan_num, first_chan = mic_dma_dev->start_ch; @@ -707,23 +707,7 @@ static int mic_dma_reg_seq_show(struct seq_file *s, void *pos) return 0; } -static int mic_dma_reg_debug_open(struct inode *inode, struct file *file) -{ - return single_open(file, mic_dma_reg_seq_show, inode->i_private); -} - -static int mic_dma_reg_debug_release(struct inode *inode, struct file *file) -{ - return single_release(inode, file); -} - -static const struct file_operations mic_dma_reg_ops = { - .owner = THIS_MODULE, - .open = mic_dma_reg_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = mic_dma_reg_debug_release -}; +DEFINE_SHOW_ATTRIBUTE(mic_dma_reg); /* Debugfs parent dir */ static struct dentry *mic_dma_dbg; @@ -747,7 +731,7 @@ static int mic_dma_driver_probe(struct mbus_device *mbdev) if (mic_dma_dev->dbg_dir) debugfs_create_file("mic_dma_reg", 0444, mic_dma_dev->dbg_dir, mic_dma_dev, - &mic_dma_reg_ops); + &mic_dma_reg_fops); } return 0; } diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 825725057e00..8e1e1b07d32f 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -189,7 +189,7 @@ bool pxad_filter_fn(struct dma_chan *chan, void *param); #include #include -static int dbg_show_requester_chan(struct seq_file *s, void *p) +static int requester_chan_show(struct seq_file *s, void *p) { struct pxad_phy *phy = s->private; int i; @@ -220,7 +220,7 @@ static int is_phys_valid(unsigned long addr) #define PXA_DCSR_STR(flag) (dcsr & PXA_DCSR_##flag ? #flag" " : "") #define PXA_DCMD_STR(flag) (dcmd & PXA_DCMD_##flag ? #flag" " : "") -static int dbg_show_descriptors(struct seq_file *s, void *p) +static int descriptors_show(struct seq_file *s, void *p) { struct pxad_phy *phy = s->private; int i, max_show = 20, burst, width; @@ -263,7 +263,7 @@ static int dbg_show_descriptors(struct seq_file *s, void *p) return 0; } -static int dbg_show_chan_state(struct seq_file *s, void *p) +static int chan_state_show(struct seq_file *s, void *p) { struct pxad_phy *phy = s->private; u32 dcsr, dcmd; @@ -306,7 +306,7 @@ static int dbg_show_chan_state(struct seq_file *s, void *p) return 0; } -static int dbg_show_state(struct seq_file *s, void *p) +static int state_show(struct seq_file *s, void *p) { struct pxad_device *pdev = s->private; @@ -329,10 +329,10 @@ static const struct file_operations dbg_fops_##name = { \ .release = single_release, \ } -DBGFS_FUNC_DECL(state); -DBGFS_FUNC_DECL(chan_state); -DBGFS_FUNC_DECL(descriptors); -DBGFS_FUNC_DECL(requester_chan); +DEFINE_SHOW_ATTRIBUTE(state); +DEFINE_SHOW_ATTRIBUTE(chan_state); +DEFINE_SHOW_ATTRIBUTE(descriptors); +DEFINE_SHOW_ATTRIBUTE(requester_chan); static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev, int ch, struct dentry *chandir) @@ -348,13 +348,13 @@ static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev, if (chan) chan_state = debugfs_create_file("state", 0400, chan, dt, - &dbg_fops_chan_state); + &chan_state_fops); if (chan_state) chan_descr = debugfs_create_file("descriptors", 0400, chan, dt, - &dbg_fops_descriptors); + &descriptors_fops); if (chan_descr) chan_reqs = debugfs_create_file("requesters", 0400, chan, dt, - &dbg_fops_requester_chan); + &requester_chan_fops); if (!chan_reqs) goto err_state; @@ -375,7 +375,7 @@ static void pxad_init_debugfs(struct pxad_device *pdev) goto err_root; pdev->dbgfs_state = debugfs_create_file("state", 0400, pdev->dbgfs_root, - pdev, &dbg_fops_state); + pdev, &state_fops); if (!pdev->dbgfs_state) goto err_state; diff --git a/drivers/dma/qcom/hidma_dbg.c b/drivers/dma/qcom/hidma_dbg.c index 3bdcb8056a36..9523faf7acdc 100644 --- a/drivers/dma/qcom/hidma_dbg.c +++ b/drivers/dma/qcom/hidma_dbg.c @@ -85,11 +85,11 @@ static void hidma_ll_devstats(struct seq_file *s, void *llhndl) } /* - * hidma_chan_stats: display HIDMA channel statistics + * hidma_chan_show: display HIDMA channel statistics * * Display the statistics for the current HIDMA virtual channel device. */ -static int hidma_chan_stats(struct seq_file *s, void *unused) +static int hidma_chan_show(struct seq_file *s, void *unused) { struct hidma_chan *mchan = s->private; struct hidma_desc *mdesc; @@ -117,11 +117,11 @@ static int hidma_chan_stats(struct seq_file *s, void *unused) } /* - * hidma_dma_info: display HIDMA device info + * hidma_dma_show: display HIDMA device info * * Display the info for the current HIDMA device. */ -static int hidma_dma_info(struct seq_file *s, void *unused) +static int hidma_dma_show(struct seq_file *s, void *unused) { struct hidma_dev *dmadev = s->private; resource_size_t sz; @@ -138,29 +138,8 @@ static int hidma_dma_info(struct seq_file *s, void *unused) return 0; } -static int hidma_chan_stats_open(struct inode *inode, struct file *file) -{ - return single_open(file, hidma_chan_stats, inode->i_private); -} - -static int hidma_dma_info_open(struct inode *inode, struct file *file) -{ - return single_open(file, hidma_dma_info, inode->i_private); -} - -static const struct file_operations hidma_chan_fops = { - .open = hidma_chan_stats_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations hidma_dma_fops = { - .open = hidma_dma_info_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(hidma_chan); +DEFINE_SHOW_ATTRIBUTE(hidma_dma); void hidma_debug_uninit(struct hidma_dev *dmadev) { -- 2.17.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E145AC04EB8 for ; Fri, 30 Nov 2018 15:43:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2F6F20834 for ; Fri, 30 Nov 2018 15:43:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FCo8WTtm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cFsyg4CJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2F6F20834 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=grpjstVB/6zTbldPZG8CzTnVYzKW0O+9fLNwtnF7rOE=; b=FCo 8WTtmGolIx5SL4i66SvTRtLpzJ/+XEfWCptpyFtzsdEvr1OC9iaXH/NLompvq2jmxRT8GIFkXAEC5 hIAHDnpO1f9STLIzWmNbMmcky3hxLhZeJvMCb/N/aOtAbfBQrBWvCr+2nT/2zI/PHS90uhD+zkP5o OnBtOFHhN9UFerwIxNOlwFt/AqVHSYvV/pAHrQrvSlC6veG6g+JPedvb7DTsXKyDgUiJI3xzN+SzT ibxFKhnf3JFXfq5LPcKs3tKWqb8FIskDKbEKqJLd7hTSWS2kgoxrZY1O3tjdPy3osWTJESdS9QaB8 XEcDYSqe47JPbSXqCvcsl2Sq7oCwxBA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSkwd-0002qt-WE; Fri, 30 Nov 2018 15:43:08 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSkwb-0002qU-5z for linux-arm-kernel@lists.infradead.org; Fri, 30 Nov 2018 15:43:06 +0000 Received: by mail-pl1-x643.google.com with SMTP id b5so2995357plr.4 for ; Fri, 30 Nov 2018 07:42:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uYeud0fxLPAPxUoh2TgR7dbMxlxzOz2VZH6XeH1cmwE=; b=cFsyg4CJwrOaHiMtgBOybk1L1xey8Atlq3Z3FC3wNBqJaIPQ/7VR/0YnkQvOH3iwbK uM91aOkHXBRoI367JoZN1b8vzsfnb2p4y5XjgI5TB4HvLZQYTAttl2L7DQEn1Z6BjFou p5B0nVncoDW6CDPfu7wUEmFkEJLNxAPBKBpS9mtBYZGyQBZ3ftd1uUkuwDiYdc9goh3j efQxntdXnH1UH0nClkWocmKWSKLQu5bnlN526rFKH1i0ygWylnMzV0+HPopXQSDd7r8j 7es2r4GXtnetLo4xzXEjoQ6fQUKgrb+Gq+PR0DKQkA5Bmqz123D2HtrAElbuT9IE9Ydx msxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uYeud0fxLPAPxUoh2TgR7dbMxlxzOz2VZH6XeH1cmwE=; b=pqAwtb1FBLKpfmpZ9m9Z2K3S8zHyzeL6UmEQrZYddJmyHcAhrmgb0pRR9Gw1c8LLFr NS3GNDMGpZLqnMT/Yg36YLiy44SLEdhqZNtT5BRMX7In2KgMPY7xbZs/Haizbihm95YZ wLjdy2O/odSlVnOnKY41i74+dBsKyA1kR4U/Na84yCLzborFAQa/uAx3dJl9RayVdaU9 4IcnaNKvdlgiArVmVlzMUUxVJBKtPNV/9PEHZl6L7nf1EtMcG3//+BAw8y8q0X2FuT9h NhnKUE+ssO7p1pd7l5OdvJcpyW48Sk7IyFCzUIcTY3QA3RC4ZgPnac83CyJrY9dhzrPD pwJA== X-Gm-Message-State: AA+aEWbw4OrP0J+mcOPq0YBb+8aqRvts+sZJGdIotmZhVRLFDbF8v5sH p+9I9WdBL0OMCLfMoKw10WY= X-Google-Smtp-Source: AFSGD/UaSzRQCki3hJ6+Bm0LgKyMG0OxKaDAtNxa7hh+EIwurkbvfCwTelx+vcO/ccwWciVx6CZ4gw== X-Received: by 2002:a17:902:bd46:: with SMTP id b6mr6099523plx.231.1543592574156; Fri, 30 Nov 2018 07:42:54 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id a73sm15460275pfa.7.2018.11.30.07.42.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 07:42:53 -0800 (PST) From: Yangtao Li To: dan.j.williams@intel.com, vkoul@kernel.org, sudeep.dutt@intel.com, ashutosh.dixit@intel.com, daniel@zonque.org, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, okaya@kernel.org, andy.gross@linaro.org, david.brown@linaro.org Subject: [PATCH] dmaengine: remove DBGFS_FUNC_DECL() Date: Fri, 30 Nov 2018 10:42:49 -0500 Message-Id: <20181130154249.3222-1-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181130_074305_244704_BEA18D7C X-CRM114-Status: GOOD ( 12.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yangtao Li , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org We already have the DEFINE_SHOW_ATTRIBUTE,There is no need to define such a macro,so remove DBGFS_FUNC_DECL.Also use macro to simplify some code. Signed-off-by: Yangtao Li --- drivers/dma/amba-pl08x.c | 14 ++------------ drivers/dma/mic_x100_dma.c | 22 +++------------------- drivers/dma/pxa_dma.c | 24 ++++++++++++------------ drivers/dma/qcom/hidma_dbg.c | 33 ++++++--------------------------- 4 files changed, 23 insertions(+), 70 deletions(-) diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 97483df1f82e..fc8c2bab563c 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -2505,24 +2505,14 @@ static int pl08x_debugfs_show(struct seq_file *s, void *data) return 0; } -static int pl08x_debugfs_open(struct inode *inode, struct file *file) -{ - return single_open(file, pl08x_debugfs_show, inode->i_private); -} - -static const struct file_operations pl08x_debugfs_operations = { - .open = pl08x_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(pl08x_debugfs); static void init_pl08x_debugfs(struct pl08x_driver_data *pl08x) { /* Expose a simple debugfs interface to view all clocks */ (void) debugfs_create_file(dev_name(&pl08x->adev->dev), S_IFREG | S_IRUGO, NULL, pl08x, - &pl08x_debugfs_operations); + &pl08x_debugfs_fops); } #else diff --git a/drivers/dma/mic_x100_dma.c b/drivers/dma/mic_x100_dma.c index adfd316db1a8..6a91e28d537d 100644 --- a/drivers/dma/mic_x100_dma.c +++ b/drivers/dma/mic_x100_dma.c @@ -676,7 +676,7 @@ static void mic_dma_dev_unreg(struct mic_dma_device *mic_dma_dev) } /* DEBUGFS CODE */ -static int mic_dma_reg_seq_show(struct seq_file *s, void *pos) +static int mic_dma_reg_show(struct seq_file *s, void *pos) { struct mic_dma_device *mic_dma_dev = s->private; int i, chan_num, first_chan = mic_dma_dev->start_ch; @@ -707,23 +707,7 @@ static int mic_dma_reg_seq_show(struct seq_file *s, void *pos) return 0; } -static int mic_dma_reg_debug_open(struct inode *inode, struct file *file) -{ - return single_open(file, mic_dma_reg_seq_show, inode->i_private); -} - -static int mic_dma_reg_debug_release(struct inode *inode, struct file *file) -{ - return single_release(inode, file); -} - -static const struct file_operations mic_dma_reg_ops = { - .owner = THIS_MODULE, - .open = mic_dma_reg_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = mic_dma_reg_debug_release -}; +DEFINE_SHOW_ATTRIBUTE(mic_dma_reg); /* Debugfs parent dir */ static struct dentry *mic_dma_dbg; @@ -747,7 +731,7 @@ static int mic_dma_driver_probe(struct mbus_device *mbdev) if (mic_dma_dev->dbg_dir) debugfs_create_file("mic_dma_reg", 0444, mic_dma_dev->dbg_dir, mic_dma_dev, - &mic_dma_reg_ops); + &mic_dma_reg_fops); } return 0; } diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 825725057e00..8e1e1b07d32f 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -189,7 +189,7 @@ bool pxad_filter_fn(struct dma_chan *chan, void *param); #include #include -static int dbg_show_requester_chan(struct seq_file *s, void *p) +static int requester_chan_show(struct seq_file *s, void *p) { struct pxad_phy *phy = s->private; int i; @@ -220,7 +220,7 @@ static int is_phys_valid(unsigned long addr) #define PXA_DCSR_STR(flag) (dcsr & PXA_DCSR_##flag ? #flag" " : "") #define PXA_DCMD_STR(flag) (dcmd & PXA_DCMD_##flag ? #flag" " : "") -static int dbg_show_descriptors(struct seq_file *s, void *p) +static int descriptors_show(struct seq_file *s, void *p) { struct pxad_phy *phy = s->private; int i, max_show = 20, burst, width; @@ -263,7 +263,7 @@ static int dbg_show_descriptors(struct seq_file *s, void *p) return 0; } -static int dbg_show_chan_state(struct seq_file *s, void *p) +static int chan_state_show(struct seq_file *s, void *p) { struct pxad_phy *phy = s->private; u32 dcsr, dcmd; @@ -306,7 +306,7 @@ static int dbg_show_chan_state(struct seq_file *s, void *p) return 0; } -static int dbg_show_state(struct seq_file *s, void *p) +static int state_show(struct seq_file *s, void *p) { struct pxad_device *pdev = s->private; @@ -329,10 +329,10 @@ static const struct file_operations dbg_fops_##name = { \ .release = single_release, \ } -DBGFS_FUNC_DECL(state); -DBGFS_FUNC_DECL(chan_state); -DBGFS_FUNC_DECL(descriptors); -DBGFS_FUNC_DECL(requester_chan); +DEFINE_SHOW_ATTRIBUTE(state); +DEFINE_SHOW_ATTRIBUTE(chan_state); +DEFINE_SHOW_ATTRIBUTE(descriptors); +DEFINE_SHOW_ATTRIBUTE(requester_chan); static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev, int ch, struct dentry *chandir) @@ -348,13 +348,13 @@ static struct dentry *pxad_dbg_alloc_chan(struct pxad_device *pdev, if (chan) chan_state = debugfs_create_file("state", 0400, chan, dt, - &dbg_fops_chan_state); + &chan_state_fops); if (chan_state) chan_descr = debugfs_create_file("descriptors", 0400, chan, dt, - &dbg_fops_descriptors); + &descriptors_fops); if (chan_descr) chan_reqs = debugfs_create_file("requesters", 0400, chan, dt, - &dbg_fops_requester_chan); + &requester_chan_fops); if (!chan_reqs) goto err_state; @@ -375,7 +375,7 @@ static void pxad_init_debugfs(struct pxad_device *pdev) goto err_root; pdev->dbgfs_state = debugfs_create_file("state", 0400, pdev->dbgfs_root, - pdev, &dbg_fops_state); + pdev, &state_fops); if (!pdev->dbgfs_state) goto err_state; diff --git a/drivers/dma/qcom/hidma_dbg.c b/drivers/dma/qcom/hidma_dbg.c index 3bdcb8056a36..9523faf7acdc 100644 --- a/drivers/dma/qcom/hidma_dbg.c +++ b/drivers/dma/qcom/hidma_dbg.c @@ -85,11 +85,11 @@ static void hidma_ll_devstats(struct seq_file *s, void *llhndl) } /* - * hidma_chan_stats: display HIDMA channel statistics + * hidma_chan_show: display HIDMA channel statistics * * Display the statistics for the current HIDMA virtual channel device. */ -static int hidma_chan_stats(struct seq_file *s, void *unused) +static int hidma_chan_show(struct seq_file *s, void *unused) { struct hidma_chan *mchan = s->private; struct hidma_desc *mdesc; @@ -117,11 +117,11 @@ static int hidma_chan_stats(struct seq_file *s, void *unused) } /* - * hidma_dma_info: display HIDMA device info + * hidma_dma_show: display HIDMA device info * * Display the info for the current HIDMA device. */ -static int hidma_dma_info(struct seq_file *s, void *unused) +static int hidma_dma_show(struct seq_file *s, void *unused) { struct hidma_dev *dmadev = s->private; resource_size_t sz; @@ -138,29 +138,8 @@ static int hidma_dma_info(struct seq_file *s, void *unused) return 0; } -static int hidma_chan_stats_open(struct inode *inode, struct file *file) -{ - return single_open(file, hidma_chan_stats, inode->i_private); -} - -static int hidma_dma_info_open(struct inode *inode, struct file *file) -{ - return single_open(file, hidma_dma_info, inode->i_private); -} - -static const struct file_operations hidma_chan_fops = { - .open = hidma_chan_stats_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations hidma_dma_fops = { - .open = hidma_dma_info_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(hidma_chan); +DEFINE_SHOW_ATTRIBUTE(hidma_dma); void hidma_debug_uninit(struct hidma_dev *dmadev) { -- 2.17.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel