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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, 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 1BCE3C3F2D7 for ; Tue, 3 Mar 2020 12:35:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE5AD2086A for ; Tue, 3 Mar 2020 12:35:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="lxhgAcwb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729457AbgCCMf2 (ORCPT ); Tue, 3 Mar 2020 07:35:28 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:35625 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728497AbgCCMfJ (ORCPT ); Tue, 3 Mar 2020 07:35:09 -0500 X-UUID: 3afd98f6b9104078a18fb3efc9045a4f-20200303 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=lH1GxrrBmjcQZs+IZ5Gs3RNfRgwZkD+ZkgKeH4PktnM=; b=lxhgAcwbab2Quu1Etl+PA+rpwyFXikkWlFEImnHAAhqraSm3bZ7M+0TctsB06y4Ul1v+9CYs6E4zSTNEINlq4FQ/yi+4JxE6UnkFxy/mbbfzr5kUrxI3gW/2xLfkXAKWSJNenmGAu+tuzeMOd3GyO4KC9y5z+/kfLl6g8DkeNh4=; X-UUID: 3afd98f6b9104078a18fb3efc9045a4f-20200303 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 952681490; Tue, 03 Mar 2020 20:35:01 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 3 Mar 2020 20:34:04 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 3 Mar 2020 20:35:40 +0800 From: Xia Jiang To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Rick Chang CC: , , , , , Marek Szyprowski , Tomasz Figa , , Xia Jiang Subject: [PATCH v7 04/11] media: platform: Use kernel native functions for improving code quality Date: Tue, 3 Mar 2020 20:34:39 +0800 Message-ID: <20200303123446.20095-5-xia.jiang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200303123446.20095-1-xia.jiang@mediatek.com> References: <20200303123446.20095-1-xia.jiang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VXNlIGNsYW1wKCkgdG8gcmVwbGFjZSBtdGtfanBlZ19ib3VuZF9hbGlnbl9pbWFnZSgpIGFuZCBy b3VuZCgpIHRvDQpyZXBsYWNlIG10a19qcGVnX2FsaWduKCkuDQoNClNpZ25lZC1vZmYtYnk6IFhp YSBKaWFuZyA8eGlhLmppYW5nQG1lZGlhdGVrLmNvbT4NCi0tLQ0KIC4uLi9tZWRpYS9wbGF0Zm9y bS9tdGstanBlZy9tdGtfanBlZ19jb3JlLmMgICB8IDQxICsrKysrLS0tLS0tLS0tLS0tLS0NCiAu Li4vbWVkaWEvcGxhdGZvcm0vbXRrLWpwZWcvbXRrX2pwZWdfY29yZS5oICAgfCAgOCArKy0tDQog ZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS9tdGstanBlZy9tdGtfanBlZ19ody5jIHwgIDggKystLQ0K IGRyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLWpwZWcvbXRrX2pwZWdfaHcuaCB8ICA1IC0tLQ0K IDQgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgNDMgZGVsZXRpb25zKC0pDQoNCmRp ZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay1qcGVnL210a19qcGVnX2NvcmUu YyBiL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLWpwZWcvbXRrX2pwZWdfY29yZS5jDQppbmRl eCBmYjJjOGQwMjY1ODAuLjRlOWZmMWY5NzMyZSAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvbWVkaWEv cGxhdGZvcm0vbXRrLWpwZWcvbXRrX2pwZWdfY29yZS5jDQorKysgYi9kcml2ZXJzL21lZGlhL3Bs YXRmb3JtL210ay1qcGVnL210a19qcGVnX2NvcmUuYw0KQEAgLTE1NywyNSArMTU3LDYgQEAgc3Rh dGljIHN0cnVjdCBtdGtfanBlZ19mbXQgKm10a19qcGVnX2ZpbmRfZm9ybWF0KHN0cnVjdCBtdGtf anBlZ19jdHggKmN0eCwNCiAJcmV0dXJuIE5VTEw7DQogfQ0KIA0KLXN0YXRpYyB2b2lkIG10a19q cGVnX2JvdW5kX2FsaWduX2ltYWdlKHUzMiAqdywgdW5zaWduZWQgaW50IHdtaW4sDQotCQkJCSAg ICAgICB1bnNpZ25lZCBpbnQgd21heCwgdW5zaWduZWQgaW50IHdhbGlnbiwNCi0JCQkJICAgICAg IHUzMiAqaCwgdW5zaWduZWQgaW50IGhtaW4sDQotCQkJCSAgICAgICB1bnNpZ25lZCBpbnQgaG1h eCwgdW5zaWduZWQgaW50IGhhbGlnbikNCi17DQotCWludCB3aWR0aCwgaGVpZ2h0LCB3X3N0ZXAs IGhfc3RlcDsNCi0NCi0Jd2lkdGggPSAqdzsNCi0JaGVpZ2h0ID0gKmg7DQotCXdfc3RlcCA9IDEg PDwgd2FsaWduOw0KLQloX3N0ZXAgPSAxIDw8IGhhbGlnbjsNCi0NCi0JdjRsX2JvdW5kX2FsaWdu X2ltYWdlKHcsIHdtaW4sIHdtYXgsIHdhbGlnbiwgaCwgaG1pbiwgaG1heCwgaGFsaWduLCAwKTsN Ci0JaWYgKCp3IDwgd2lkdGggJiYgKCp3ICsgd19zdGVwKSA8PSB3bWF4KQ0KLQkJKncgKz0gd19z dGVwOw0KLQlpZiAoKmggPCBoZWlnaHQgJiYgKCpoICsgaF9zdGVwKSA8PSBobWF4KQ0KLQkJKmgg Kz0gaF9zdGVwOw0KLX0NCi0NCiBzdGF0aWMgdm9pZCBtdGtfanBlZ19hZGp1c3RfZm10X21wbGFu ZShzdHJ1Y3QgbXRrX2pwZWdfY3R4ICpjdHgsDQogCQkJCSAgICAgICBzdHJ1Y3QgdjRsMl9mb3Jt YXQgKmYpDQogew0KQEAgLTIxOCwyNSArMTk5LDI1IEBAIHN0YXRpYyBpbnQgbXRrX2pwZWdfdHJ5 X2ZtdF9tcGxhbmUoc3RydWN0IHY0bDJfZm9ybWF0ICpmLA0KIAlpZiAocV90eXBlID09IE1US19K UEVHX0ZNVF9UWVBFX09VVFBVVCkgew0KIAkJc3RydWN0IHY0bDJfcGxhbmVfcGl4X2Zvcm1hdCAq cGZtdCA9ICZwaXhfbXAtPnBsYW5lX2ZtdFswXTsNCiANCi0JCW10a19qcGVnX2JvdW5kX2FsaWdu X2ltYWdlKCZwaXhfbXAtPndpZHRoLCBNVEtfSlBFR19NSU5fV0lEVEgsDQotCQkJCQkgICBNVEtf SlBFR19NQVhfV0lEVEgsIDAsDQotCQkJCQkgICAmcGl4X21wLT5oZWlnaHQsIE1US19KUEVHX01J Tl9IRUlHSFQsDQotCQkJCQkgICBNVEtfSlBFR19NQVhfSEVJR0hULCAwKTsNCisJCXBpeF9tcC0+ aGVpZ2h0ID0gY2xhbXAocGl4X21wLT5oZWlnaHQsIE1US19KUEVHX01JTl9IRUlHSFQsDQorCQkJ CSAgICAgICBNVEtfSlBFR19NQVhfSEVJR0hUKTsNCisJCXBpeF9tcC0+d2lkdGggPSBjbGFtcChw aXhfbXAtPndpZHRoLCBNVEtfSlBFR19NSU5fV0lEVEgsDQorCQkJCSAgICAgIE1US19KUEVHX01B WF9XSURUSCk7DQogDQogCQltZW1zZXQocGZtdC0+cmVzZXJ2ZWQsIDAsIHNpemVvZihwZm10LT5y ZXNlcnZlZCkpOw0KIAkJcGZtdC0+Ynl0ZXNwZXJsaW5lID0gMDsNCiAJCS8qIFNvdXJjZSBzaXpl IG11c3QgYmUgYWxpZ25lZCB0byAxMjggKi8NCi0JCXBmbXQtPnNpemVpbWFnZSA9IG10a19qcGVn X2FsaWduKHBmbXQtPnNpemVpbWFnZSwgMTI4KTsNCisJCXBmbXQtPnNpemVpbWFnZSA9IHJvdW5k X3VwKHBmbXQtPnNpemVpbWFnZSwgMTI4KTsNCiAJCWlmIChwZm10LT5zaXplaW1hZ2UgPT0gMCkN CiAJCQlwZm10LT5zaXplaW1hZ2UgPSBNVEtfSlBFR19ERUZBVUxUX1NJWkVJTUFHRTsNCiAJCWdv dG8gZW5kOw0KIAl9DQogDQogCS8qIHR5cGUgaXMgTVRLX0pQRUdfRk1UX1RZUEVfQ0FQVFVSRSAq Lw0KLQltdGtfanBlZ19ib3VuZF9hbGlnbl9pbWFnZSgmcGl4X21wLT53aWR0aCwgTVRLX0pQRUdf TUlOX1dJRFRILA0KLQkJCQkgICBNVEtfSlBFR19NQVhfV0lEVEgsIGZtdC0+aF9hbGlnbiwNCi0J CQkJICAgJnBpeF9tcC0+aGVpZ2h0LCBNVEtfSlBFR19NSU5fSEVJR0hULA0KLQkJCQkgICBNVEtf SlBFR19NQVhfSEVJR0hULCBmbXQtPnZfYWxpZ24pOw0KKwlwaXhfbXAtPmhlaWdodCA9IGNsYW1w KHJvdW5kX3VwKHBpeF9tcC0+aGVpZ2h0LCBmbXQtPnZfYWxpZ24pLA0KKwkJCSAgICAgICBNVEtf SlBFR19NSU5fSEVJR0hULCBNVEtfSlBFR19NQVhfSEVJR0hUKTsNCisJcGl4X21wLT53aWR0aCA9 IGNsYW1wKHJvdW5kX3VwKHBpeF9tcC0+d2lkdGgsIGZtdC0+aF9hbGlnbiksDQorCQkJICAgICAg TVRLX0pQRUdfTUlOX1dJRFRILCBNVEtfSlBFR19NQVhfV0lEVEgpOw0KIA0KIAlmb3IgKGkgPSAw OyBpIDwgZm10LT5jb2xwbGFuZXM7IGkrKykgew0KIAkJc3RydWN0IHY0bDJfcGxhbmVfcGl4X2Zv cm1hdCAqcGZtdCA9ICZwaXhfbXAtPnBsYW5lX2ZtdFtpXTsNCkBAIC03NzEsOCArNzUyLDggQEAg c3RhdGljIHZvaWQgbXRrX2pwZWdfc2V0X2RlY19zcmMoc3RydWN0IG10a19qcGVnX2N0eCAqY3R4 LA0KIHsNCiAJYnMtPnN0cl9hZGRyID0gdmIyX2RtYV9jb250aWdfcGxhbmVfZG1hX2FkZHIoc3Jj X2J1ZiwgMCk7DQogCWJzLT5lbmRfYWRkciA9IGJzLT5zdHJfYWRkciArDQotCQkJIG10a19qcGVn X2FsaWduKHZiMl9nZXRfcGxhbmVfcGF5bG9hZChzcmNfYnVmLCAwKSwgMTYpOw0KLQlicy0+c2l6 ZSA9IG10a19qcGVnX2FsaWduKHZiMl9wbGFuZV9zaXplKHNyY19idWYsIDApLCAxMjgpOw0KKwkJ ICAgICAgIHJvdW5kX3VwKHZiMl9nZXRfcGxhbmVfcGF5bG9hZChzcmNfYnVmLCAwKSwgMTYpOw0K Kwlicy0+c2l6ZSA9IHJvdW5kX3VwKHZiMl9wbGFuZV9zaXplKHNyY19idWYsIDApLCAxMjgpOw0K IH0NCiANCiBzdGF0aWMgaW50IG10a19qcGVnX3NldF9kZWNfZHN0KHN0cnVjdCBtdGtfanBlZ19j dHggKmN0eCwNCmRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay1qcGVnL210 a19qcGVnX2NvcmUuaCBiL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLWpwZWcvbXRrX2pwZWdf Y29yZS5oDQppbmRleCA5OTliZDE0Mjc4MDkuLjI4ZTliMzBhZDVjMyAxMDA2NDQNCi0tLSBhL2Ry aXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLWpwZWcvbXRrX2pwZWdfY29yZS5oDQorKysgYi9kcml2 ZXJzL21lZGlhL3BsYXRmb3JtL210ay1qcGVnL210a19qcGVnX2NvcmUuaA0KQEAgLTIxLDEwICsy MSwxMCBAQA0KICNkZWZpbmUgTVRLX0pQRUdfRk1UX1RZUEVfT1VUUFVUCTENCiAjZGVmaW5lIE1U S19KUEVHX0ZNVF9UWVBFX0NBUFRVUkUJMg0KIA0KLSNkZWZpbmUgTVRLX0pQRUdfTUlOX1dJRFRI CTMyDQotI2RlZmluZSBNVEtfSlBFR19NSU5fSEVJR0hUCTMyDQotI2RlZmluZSBNVEtfSlBFR19N QVhfV0lEVEgJODE5Mg0KLSNkZWZpbmUgTVRLX0pQRUdfTUFYX0hFSUdIVAk4MTkyDQorI2RlZmlu ZSBNVEtfSlBFR19NSU5fV0lEVEgJMzJVDQorI2RlZmluZSBNVEtfSlBFR19NSU5fSEVJR0hUCTMy VQ0KKyNkZWZpbmUgTVRLX0pQRUdfTUFYX1dJRFRICTgxOTJVDQorI2RlZmluZSBNVEtfSlBFR19N QVhfSEVJR0hUCTgxOTJVDQogDQogI2RlZmluZSBNVEtfSlBFR19ERUZBVUxUX1NJWkVJTUFHRQko MSAqIDEwMjQgKiAxMDI0KQ0KIA0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0v bXRrLWpwZWcvbXRrX2pwZWdfaHcuYyBiL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLWpwZWcv bXRrX2pwZWdfaHcuYw0KaW5kZXggZGRmMGRmYTc4ZTIwLi42OGFiY2ZkNzQ5NGQgMTAwNjQ0DQot LS0gYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL210ay1qcGVnL210a19qcGVnX2h3LmMNCisrKyBi L2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vbXRrLWpwZWcvbXRrX2pwZWdfaHcuYw0KQEAgLTE1Mywx MCArMTUzLDEwIEBAIHN0YXRpYyBpbnQgbXRrX2pwZWdfY2FsY19kc3Rfc2l6ZShzdHJ1Y3QgbXRr X2pwZWdfZGVjX3BhcmFtICpwYXJhbSkNCiAJCQkJcGFyYW0tPnNhbXBsaW5nX3dbaV07DQogCQkv KiBvdXRwdXQgZm9ybWF0IGlzIDQyMC80MjIgKi8NCiAJCXBhcmFtLT5jb21wX3dbaV0gPSBwYWRk aW5nX3cgPj4gYnJ6X3dbaV07DQotCQlwYXJhbS0+Y29tcF93W2ldID0gbXRrX2pwZWdfYWxpZ24o cGFyYW0tPmNvbXBfd1tpXSwNCi0JCQkJCQkgIE1US19KUEVHX0RDVFNJWkUpOw0KLQkJcGFyYW0t PmltZ19zdHJpZGVbaV0gPSBpID8gbXRrX2pwZWdfYWxpZ24ocGFyYW0tPmNvbXBfd1tpXSwgMTYp DQotCQkJCQk6IG10a19qcGVnX2FsaWduKHBhcmFtLT5jb21wX3dbaV0sIDMyKTsNCisJCXBhcmFt LT5jb21wX3dbaV0gPSByb3VuZF91cChwYXJhbS0+Y29tcF93W2ldLA0KKwkJCQkJICAgIE1US19K UEVHX0RDVFNJWkUpOw0KKwkJcGFyYW0tPmltZ19zdHJpZGVbaV0gPSBpID8gcm91bmRfdXAocGFy YW0tPmNvbXBfd1tpXSwgMTYpDQorCQkJCQk6IHJvdW5kX3VwKHBhcmFtLT5jb21wX3dbaV0sIDMy KTsNCiAJCWRzX3Jvd19oW2ldID0gKE1US19KUEVHX0RDVFNJWkUgKiBwYXJhbS0+c2FtcGxpbmdf aFtpXSk7DQogCX0NCiAJcGFyYW0tPmRlY193ID0gcGFyYW0tPmltZ19zdHJpZGVbMF07DQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS9tdGstanBlZy9tdGtfanBlZ19ody5oIGIv ZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS9tdGstanBlZy9tdGtfanBlZ19ody5oDQppbmRleCA5YzY1 ODRlYWFkOTkuLjdiMDY4N2Y4ZjRiNiAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvbWVkaWEvcGxhdGZv cm0vbXRrLWpwZWcvbXRrX2pwZWdfaHcuaA0KKysrIGIvZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS9t dGstanBlZy9tdGtfanBlZ19ody5oDQpAQCAtNTQsMTEgKzU0LDYgQEAgc3RydWN0IG10a19qcGVn X2RlY19wYXJhbSB7DQogCXU4IHV2X2Jyel93Ow0KIH07DQogDQotc3RhdGljIGlubGluZSB1MzIg bXRrX2pwZWdfYWxpZ24odTMyIHZhbCwgdTMyIGFsaWduKQ0KLXsNCi0JcmV0dXJuICh2YWwgKyBh bGlnbiAtIDEpICYgfihhbGlnbiAtIDEpOw0KLX0NCi0NCiBzdHJ1Y3QgbXRrX2pwZWdfYnMgew0K IAlkbWFfYWRkcl90CXN0cl9hZGRyOw0KIAlkbWFfYWRkcl90CWVuZF9hZGRyOw0KLS0gDQoyLjE4 LjANCg== 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,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 E92CEC3F2CD for ; Tue, 3 Mar 2020 12:47:10 +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 BE48B20848 for ; Tue, 3 Mar 2020 12:47:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gtG0GRXd"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="fEJrdJ6m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE48B20848 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=qp4Cv7dtpLsjyD7+5lXth2YHvG5thVV0x+skVZjIqsE=; b=gtG0GRXdSvN+bG R3VFEyqq1z0NVqrAUWgpWZcENx0ByPKczHWg+Z9ePVkXwilvDNt0l9p279pLtb/k6LJR/cYjtaEkN GSQ9ZzzPy/sa6AylxbT+NgoA14NtyHQZM1kahKC7INFzbDjTW0kZZTHgbUNwfnkrKV3BsmMz8l8BY IYhSLmoxyceTs1JNwBL9IL2HR91lb5K0mQZNI1wTL6Diy4I8FUtKUxQZ2djWlYGCjvaGBU6t6n/1b EkIRP600a2HbqM65n2LnVizPWverDgCxxj4XMN6KvhWo6Zo51gP/96StTnNphzKKuIf1m8gAfCbgt vBey0wP4+aQ7i4QlhGwA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j96ww-0001dN-9Z; Tue, 03 Mar 2020 12:47:02 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j96v9-0007Uz-9e; Tue, 03 Mar 2020 12:45:13 +0000 X-UUID: 368110217fed44dba42874720fc3ecd2-20200303 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=lH1GxrrBmjcQZs+IZ5Gs3RNfRgwZkD+ZkgKeH4PktnM=; b=fEJrdJ6moLK/dZX658utmY/SvMNjYwSlEsuuRz8c34nZrR81gaD5a4hD7xnMMpJDuLlN9VoUJ9xPV5B5RtM4ZEVh5R+Y9tUQcnCLF5lz0saHmONCBLhQAFRV7SLbKdbwmy9c+80sR/0W9G2+xaW3TwkJu3YeATfPwAKpYw1v+F0=; X-UUID: 368110217fed44dba42874720fc3ecd2-20200303 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1678892120; Tue, 03 Mar 2020 04:45:03 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 3 Mar 2020 04:36:17 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 3 Mar 2020 20:34:04 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 3 Mar 2020 20:35:40 +0800 From: Xia Jiang To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , "Matthias Brugger" , Rick Chang Subject: [PATCH v7 04/11] media: platform: Use kernel native functions for improving code quality Date: Tue, 3 Mar 2020 20:34:39 +0800 Message-ID: <20200303123446.20095-5-xia.jiang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200303123446.20095-1-xia.jiang@mediatek.com> References: <20200303123446.20095-1-xia.jiang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200303_044511_473976_A1F78D06 X-CRM114-Status: GOOD ( 12.34 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xia Jiang , devicetree@vger.kernel.org, srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Tomasz Figa , linux-mediatek@lists.infradead.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Use clamp() to replace mtk_jpeg_bound_align_image() and round() to replace mtk_jpeg_align(). Signed-off-by: Xia Jiang --- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 41 +++++-------------- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++-- drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c | 8 ++-- drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h | 5 --- 4 files changed, 19 insertions(+), 43 deletions(-) diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c index fb2c8d026580..4e9ff1f9732e 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c @@ -157,25 +157,6 @@ static struct mtk_jpeg_fmt *mtk_jpeg_find_format(struct mtk_jpeg_ctx *ctx, return NULL; } -static void mtk_jpeg_bound_align_image(u32 *w, unsigned int wmin, - unsigned int wmax, unsigned int walign, - u32 *h, unsigned int hmin, - unsigned int hmax, unsigned int halign) -{ - int width, height, w_step, h_step; - - width = *w; - height = *h; - w_step = 1 << walign; - h_step = 1 << halign; - - v4l_bound_align_image(w, wmin, wmax, walign, h, hmin, hmax, halign, 0); - if (*w < width && (*w + w_step) <= wmax) - *w += w_step; - if (*h < height && (*h + h_step) <= hmax) - *h += h_step; -} - static void mtk_jpeg_adjust_fmt_mplane(struct mtk_jpeg_ctx *ctx, struct v4l2_format *f) { @@ -218,25 +199,25 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, if (q_type == MTK_JPEG_FMT_TYPE_OUTPUT) { struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[0]; - mtk_jpeg_bound_align_image(&pix_mp->width, MTK_JPEG_MIN_WIDTH, - MTK_JPEG_MAX_WIDTH, 0, - &pix_mp->height, MTK_JPEG_MIN_HEIGHT, - MTK_JPEG_MAX_HEIGHT, 0); + pix_mp->height = clamp(pix_mp->height, MTK_JPEG_MIN_HEIGHT, + MTK_JPEG_MAX_HEIGHT); + pix_mp->width = clamp(pix_mp->width, MTK_JPEG_MIN_WIDTH, + MTK_JPEG_MAX_WIDTH); memset(pfmt->reserved, 0, sizeof(pfmt->reserved)); pfmt->bytesperline = 0; /* Source size must be aligned to 128 */ - pfmt->sizeimage = mtk_jpeg_align(pfmt->sizeimage, 128); + pfmt->sizeimage = round_up(pfmt->sizeimage, 128); if (pfmt->sizeimage == 0) pfmt->sizeimage = MTK_JPEG_DEFAULT_SIZEIMAGE; goto end; } /* type is MTK_JPEG_FMT_TYPE_CAPTURE */ - mtk_jpeg_bound_align_image(&pix_mp->width, MTK_JPEG_MIN_WIDTH, - MTK_JPEG_MAX_WIDTH, fmt->h_align, - &pix_mp->height, MTK_JPEG_MIN_HEIGHT, - MTK_JPEG_MAX_HEIGHT, fmt->v_align); + pix_mp->height = clamp(round_up(pix_mp->height, fmt->v_align), + MTK_JPEG_MIN_HEIGHT, MTK_JPEG_MAX_HEIGHT); + pix_mp->width = clamp(round_up(pix_mp->width, fmt->h_align), + MTK_JPEG_MIN_WIDTH, MTK_JPEG_MAX_WIDTH); for (i = 0; i < fmt->colplanes; i++) { struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[i]; @@ -771,8 +752,8 @@ static void mtk_jpeg_set_dec_src(struct mtk_jpeg_ctx *ctx, { bs->str_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0); bs->end_addr = bs->str_addr + - mtk_jpeg_align(vb2_get_plane_payload(src_buf, 0), 16); - bs->size = mtk_jpeg_align(vb2_plane_size(src_buf, 0), 128); + round_up(vb2_get_plane_payload(src_buf, 0), 16); + bs->size = round_up(vb2_plane_size(src_buf, 0), 128); } static int mtk_jpeg_set_dec_dst(struct mtk_jpeg_ctx *ctx, diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h index 999bd1427809..28e9b30ad5c3 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h @@ -21,10 +21,10 @@ #define MTK_JPEG_FMT_TYPE_OUTPUT 1 #define MTK_JPEG_FMT_TYPE_CAPTURE 2 -#define MTK_JPEG_MIN_WIDTH 32 -#define MTK_JPEG_MIN_HEIGHT 32 -#define MTK_JPEG_MAX_WIDTH 8192 -#define MTK_JPEG_MAX_HEIGHT 8192 +#define MTK_JPEG_MIN_WIDTH 32U +#define MTK_JPEG_MIN_HEIGHT 32U +#define MTK_JPEG_MAX_WIDTH 8192U +#define MTK_JPEG_MAX_HEIGHT 8192U #define MTK_JPEG_DEFAULT_SIZEIMAGE (1 * 1024 * 1024) diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c index ddf0dfa78e20..68abcfd7494d 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c @@ -153,10 +153,10 @@ static int mtk_jpeg_calc_dst_size(struct mtk_jpeg_dec_param *param) param->sampling_w[i]; /* output format is 420/422 */ param->comp_w[i] = padding_w >> brz_w[i]; - param->comp_w[i] = mtk_jpeg_align(param->comp_w[i], - MTK_JPEG_DCTSIZE); - param->img_stride[i] = i ? mtk_jpeg_align(param->comp_w[i], 16) - : mtk_jpeg_align(param->comp_w[i], 32); + param->comp_w[i] = round_up(param->comp_w[i], + MTK_JPEG_DCTSIZE); + param->img_stride[i] = i ? round_up(param->comp_w[i], 16) + : round_up(param->comp_w[i], 32); ds_row_h[i] = (MTK_JPEG_DCTSIZE * param->sampling_h[i]); } param->dec_w = param->img_stride[0]; diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h index 9c6584eaad99..7b0687f8f4b6 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h @@ -54,11 +54,6 @@ struct mtk_jpeg_dec_param { u8 uv_brz_w; }; -static inline u32 mtk_jpeg_align(u32 val, u32 align) -{ - return (val + align - 1) & ~(align - 1); -} - struct mtk_jpeg_bs { dma_addr_t str_addr; dma_addr_t end_addr; -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham 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 C9D56C3F2CD for ; Tue, 3 Mar 2020 12:46:48 +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 9FF872073B for ; Tue, 3 Mar 2020 12:46:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YB6Pvopp"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="fEJrdJ6m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FF872073B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=lVzPzcEDawyIHueZtM6qhWIw3k1br85kFZy5J/x6tds=; b=YB6Pvopp1gHHnX iT4dIdN9QE5JFz4s9arWz1IxL654JXA1au6hm7kx8/FoOXaMuDzuBan7XjRiqEw/4aY0CvIrtk2ps QSrgPTYXKMsVvsWdenHvOG47jCj7guAg0V/0H4qNgxFtxcn7OrGFtQjoTNTTUGb/PWkQRpqan6gwf J33S8uD97fxthYPuw7uweycWO1GgH8xDm0O7y77sMFMwULQ+IXKLcW3twzumKvz11+33nDTbiuthM 4pL2VLKnEzaD4uW5Ru/gxGND8BLv8O9oBdjRu/6lre17qrakzODKkpSTXs3NciQ1gnzn695AHvD+G RF2oQVne202oq8oaz4Kg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j96wh-0001PT-H2; Tue, 03 Mar 2020 12:46:47 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j96v9-0007Uz-9e; Tue, 03 Mar 2020 12:45:13 +0000 X-UUID: 368110217fed44dba42874720fc3ecd2-20200303 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=lH1GxrrBmjcQZs+IZ5Gs3RNfRgwZkD+ZkgKeH4PktnM=; b=fEJrdJ6moLK/dZX658utmY/SvMNjYwSlEsuuRz8c34nZrR81gaD5a4hD7xnMMpJDuLlN9VoUJ9xPV5B5RtM4ZEVh5R+Y9tUQcnCLF5lz0saHmONCBLhQAFRV7SLbKdbwmy9c+80sR/0W9G2+xaW3TwkJu3YeATfPwAKpYw1v+F0=; X-UUID: 368110217fed44dba42874720fc3ecd2-20200303 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1678892120; Tue, 03 Mar 2020 04:45:03 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 3 Mar 2020 04:36:17 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 3 Mar 2020 20:34:04 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 3 Mar 2020 20:35:40 +0800 From: Xia Jiang To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , "Matthias Brugger" , Rick Chang Subject: [PATCH v7 04/11] media: platform: Use kernel native functions for improving code quality Date: Tue, 3 Mar 2020 20:34:39 +0800 Message-ID: <20200303123446.20095-5-xia.jiang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200303123446.20095-1-xia.jiang@mediatek.com> References: <20200303123446.20095-1-xia.jiang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200303_044511_473976_A1F78D06 X-CRM114-Status: GOOD ( 12.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xia Jiang , devicetree@vger.kernel.org, srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Tomasz Figa , linux-mediatek@lists.infradead.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski 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 Use clamp() to replace mtk_jpeg_bound_align_image() and round() to replace mtk_jpeg_align(). Signed-off-by: Xia Jiang --- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 41 +++++-------------- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++-- drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c | 8 ++-- drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h | 5 --- 4 files changed, 19 insertions(+), 43 deletions(-) diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c index fb2c8d026580..4e9ff1f9732e 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c @@ -157,25 +157,6 @@ static struct mtk_jpeg_fmt *mtk_jpeg_find_format(struct mtk_jpeg_ctx *ctx, return NULL; } -static void mtk_jpeg_bound_align_image(u32 *w, unsigned int wmin, - unsigned int wmax, unsigned int walign, - u32 *h, unsigned int hmin, - unsigned int hmax, unsigned int halign) -{ - int width, height, w_step, h_step; - - width = *w; - height = *h; - w_step = 1 << walign; - h_step = 1 << halign; - - v4l_bound_align_image(w, wmin, wmax, walign, h, hmin, hmax, halign, 0); - if (*w < width && (*w + w_step) <= wmax) - *w += w_step; - if (*h < height && (*h + h_step) <= hmax) - *h += h_step; -} - static void mtk_jpeg_adjust_fmt_mplane(struct mtk_jpeg_ctx *ctx, struct v4l2_format *f) { @@ -218,25 +199,25 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, if (q_type == MTK_JPEG_FMT_TYPE_OUTPUT) { struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[0]; - mtk_jpeg_bound_align_image(&pix_mp->width, MTK_JPEG_MIN_WIDTH, - MTK_JPEG_MAX_WIDTH, 0, - &pix_mp->height, MTK_JPEG_MIN_HEIGHT, - MTK_JPEG_MAX_HEIGHT, 0); + pix_mp->height = clamp(pix_mp->height, MTK_JPEG_MIN_HEIGHT, + MTK_JPEG_MAX_HEIGHT); + pix_mp->width = clamp(pix_mp->width, MTK_JPEG_MIN_WIDTH, + MTK_JPEG_MAX_WIDTH); memset(pfmt->reserved, 0, sizeof(pfmt->reserved)); pfmt->bytesperline = 0; /* Source size must be aligned to 128 */ - pfmt->sizeimage = mtk_jpeg_align(pfmt->sizeimage, 128); + pfmt->sizeimage = round_up(pfmt->sizeimage, 128); if (pfmt->sizeimage == 0) pfmt->sizeimage = MTK_JPEG_DEFAULT_SIZEIMAGE; goto end; } /* type is MTK_JPEG_FMT_TYPE_CAPTURE */ - mtk_jpeg_bound_align_image(&pix_mp->width, MTK_JPEG_MIN_WIDTH, - MTK_JPEG_MAX_WIDTH, fmt->h_align, - &pix_mp->height, MTK_JPEG_MIN_HEIGHT, - MTK_JPEG_MAX_HEIGHT, fmt->v_align); + pix_mp->height = clamp(round_up(pix_mp->height, fmt->v_align), + MTK_JPEG_MIN_HEIGHT, MTK_JPEG_MAX_HEIGHT); + pix_mp->width = clamp(round_up(pix_mp->width, fmt->h_align), + MTK_JPEG_MIN_WIDTH, MTK_JPEG_MAX_WIDTH); for (i = 0; i < fmt->colplanes; i++) { struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[i]; @@ -771,8 +752,8 @@ static void mtk_jpeg_set_dec_src(struct mtk_jpeg_ctx *ctx, { bs->str_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0); bs->end_addr = bs->str_addr + - mtk_jpeg_align(vb2_get_plane_payload(src_buf, 0), 16); - bs->size = mtk_jpeg_align(vb2_plane_size(src_buf, 0), 128); + round_up(vb2_get_plane_payload(src_buf, 0), 16); + bs->size = round_up(vb2_plane_size(src_buf, 0), 128); } static int mtk_jpeg_set_dec_dst(struct mtk_jpeg_ctx *ctx, diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h index 999bd1427809..28e9b30ad5c3 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h @@ -21,10 +21,10 @@ #define MTK_JPEG_FMT_TYPE_OUTPUT 1 #define MTK_JPEG_FMT_TYPE_CAPTURE 2 -#define MTK_JPEG_MIN_WIDTH 32 -#define MTK_JPEG_MIN_HEIGHT 32 -#define MTK_JPEG_MAX_WIDTH 8192 -#define MTK_JPEG_MAX_HEIGHT 8192 +#define MTK_JPEG_MIN_WIDTH 32U +#define MTK_JPEG_MIN_HEIGHT 32U +#define MTK_JPEG_MAX_WIDTH 8192U +#define MTK_JPEG_MAX_HEIGHT 8192U #define MTK_JPEG_DEFAULT_SIZEIMAGE (1 * 1024 * 1024) diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c index ddf0dfa78e20..68abcfd7494d 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c @@ -153,10 +153,10 @@ static int mtk_jpeg_calc_dst_size(struct mtk_jpeg_dec_param *param) param->sampling_w[i]; /* output format is 420/422 */ param->comp_w[i] = padding_w >> brz_w[i]; - param->comp_w[i] = mtk_jpeg_align(param->comp_w[i], - MTK_JPEG_DCTSIZE); - param->img_stride[i] = i ? mtk_jpeg_align(param->comp_w[i], 16) - : mtk_jpeg_align(param->comp_w[i], 32); + param->comp_w[i] = round_up(param->comp_w[i], + MTK_JPEG_DCTSIZE); + param->img_stride[i] = i ? round_up(param->comp_w[i], 16) + : round_up(param->comp_w[i], 32); ds_row_h[i] = (MTK_JPEG_DCTSIZE * param->sampling_h[i]); } param->dec_w = param->img_stride[0]; diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h index 9c6584eaad99..7b0687f8f4b6 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h @@ -54,11 +54,6 @@ struct mtk_jpeg_dec_param { u8 uv_brz_w; }; -static inline u32 mtk_jpeg_align(u32 val, u32 align) -{ - return (val + align - 1) & ~(align - 1); -} - struct mtk_jpeg_bs { dma_addr_t str_addr; dma_addr_t end_addr; -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel