From patchwork Thu Aug 1 03:44:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170291 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836232ile; Wed, 31 Jul 2019 20:45:06 -0700 (PDT) X-Received: by 2002:aa7:81d4:: with SMTP id c20mr51215567pfn.235.1564631106044; Wed, 31 Jul 2019 20:45:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631106; cv=none; d=google.com; s=arc-20160816; b=OJeInfBl78nVDgMOl0tbkoKGOovTmjlMfZ/+N6ggjZBUzyDb9ffdm51mIreIG1/SZf SZ2VZdZTb4Y3yGtAFFKOVcMiy3Qam+7GhOJZ6Vr2P/GI93JHmK/SYVVrEvkycR/pM2jR uQ/MKcaVNfmtrioej+U5OeN3tTV6rPGexhI2Wcdaqh7YsdiicZqyByzGYs5um7vv9jIk MMUyYDebCURa9/b2nunETyfH9ZRV1Lx/3LGChZNi3LgP8tRQKD55Yc1DnlNayfSnaf4M oVvoqed2s5Yq4sKFOFETTyEtuLNRn14hVKnkzR8nf5XyHpEQDL+CIVfvFDNibK1gK0E4 gwBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FV+Ip5UJVFLvXV2Kbx6mP8jgdekGleioA3N1UoXWC+U=; b=0+ZuW6IiPnIV5JNPs46Oo25kftx0wEa59FDAEa0Vqa+GeNcqJ0gNEOK/AQisnPFQkB NIiTb0mbuY/YJpDLFcRDOtiz51JJiEAyB8hvxwacss9+xzfkcOBLbZdTZzHUzIx9yX8K 1sIyZYp+Z35RGiAn3tCqRB7yM2hYBLnzTLH2hxYWZmlOk32b+zttIuNxlKfVfoAIIQ8K xKT/nhEMjhiNZGu40GijPAWkU1e7pH9+CUdtZKVC3VAcILpJ33Zn5OkRNtzD2rRvuV8b k0mz/9uTGGzOL/DffoP3AzLyn+OU3k+C/r5cb2hGGBCJdWWnFqBRfEx9hZUP6sdYesou W6kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uHlnFrgC; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id z142sor51032290pfc.31.2019.07.31.20.45.05 for (Google Transport Security); Wed, 31 Jul 2019 20:45:06 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uHlnFrgC; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FV+Ip5UJVFLvXV2Kbx6mP8jgdekGleioA3N1UoXWC+U=; b=uHlnFrgC8+6Hfx3oZ5a9WhLfAgD+Y92NSQA89mb3ow8hsetvrvjs1DXJqOSilKtF0w TxSk2bWONbISR+w93knaEIZLQF2wPtpRx6eRi7kwtfpEhi4Auw17HwGJv9KybM3hSVoA 0ZhJCRbwtDI6O0HBojX4g880aVI7TWIpvtdkgTOxBglM8ve1niAjB0BH+ZkZ8RQLT93z iP4kqyzWPA/f+w59h08TZL9M4Jw4qGanPUfn1ZYyr2g0fmeCuVvT0NtSP2fw3YhiG43W n0PsKHdzC9QJZ8SqbqGdfq5AKd/juAs/9kGGeqpSMmYrrASeJJs5bu1t/zBs3UbHkryo dLMw== 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:in-reply-to :references; bh=FV+Ip5UJVFLvXV2Kbx6mP8jgdekGleioA3N1UoXWC+U=; b=TnigJ1j/tdtzVuztue64DxU1tzVHiN0SsRkVn59QJYdRDgvqZKMfwfLw1B3hjryOR2 QJoIE/Y8eldyRXIJaiyUJw4RFaB/kPGKyruZaXkNic+ZCGw6Qu1NyqU9bmJdqmpy3nx+ jcKwdadG0LGDSlyfeL3SV2xDHiFo11Y5r50JmSHnzuvfcOR5/gLJfL4X1Ud0qGNJc7p1 vzoVGqfnq/lldaROf9tUHRGIWPCSx2tJ223T8m/Z5KMlUhQcSZfJRAGZKYn0MBExsWPI dyrrS70B8FcUky0FcfE4DDBgS3onMDPVoO1f9LO+gzkxmwZSgGO59xXACLBhaaO3VzpC gtTw== X-Gm-Message-State: APjAAAUJYGeRRCo20LCitkcCwMfCzOB7gfWRE8YzrfADYGbwV3YGRoUm +gAeCiH+1lfQ1WwhLC0diaCdgy6J X-Google-Smtp-Source: APXvYqxvh6sg9DNxbgSmyTVWeayZICBhMnV4QBgK8vE6UF4xYdS0IxloUbKEFvIE6TntZDtyx76h2g== X-Received: by 2002:aa7:85d8:: with SMTP id z24mr42260227pfn.218.1564631105631; Wed, 31 Jul 2019 20:45:05 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h70sm64775674pgc.36.2019.07.31.20.45.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:04 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v3 13/26] drm: kirin: Reanme dc_ops to kirin_drm_data Date: Thu, 1 Aug 2019 03:44:26 +0000 Message-Id: <20190801034439.98227-14-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801034439.98227-1-john.stultz@linaro.org> References: <20190801034439.98227-1-john.stultz@linaro.org> From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch renames the struct kirin_dc_ops to struct kirin_drm_data and cleans up the related variable names. Cc: Rongrong Zou Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 16 ++++++++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 3ad1e290bf58..acae2815eded 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -1055,7 +1055,7 @@ static void ade_drm_cleanup(struct platform_device *pdev) { } -const struct kirin_dc_ops ade_dc_ops = { +struct kirin_drm_data ade_driver_data = { .init = ade_drm_init, .cleanup = ade_drm_cleanup }; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index bfe0505ac4a0..60c164623f56 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -28,12 +28,12 @@ #include "kirin_drm_drv.h" -static struct kirin_dc_ops *dc_ops; +static struct kirin_drm_data *driver_data; static int kirin_drm_kms_cleanup(struct drm_device *dev) { drm_kms_helper_poll_fini(dev); - dc_ops->cleanup(to_platform_device(dev->dev)); + driver_data->cleanup(to_platform_device(dev->dev)); drm_mode_config_cleanup(dev); return 0; @@ -67,7 +67,7 @@ static int kirin_drm_kms_init(struct drm_device *dev) kirin_drm_mode_config_init(dev); /* display controller init */ - ret = dc_ops->init(to_platform_device(dev->dev)); + ret = driver_data->init(to_platform_device(dev->dev)); if (ret) goto err_mode_config_cleanup; @@ -98,7 +98,7 @@ static int kirin_drm_kms_init(struct drm_device *dev) err_unbind_all: component_unbind_all(dev->dev, dev); err_dc_cleanup: - dc_ops->cleanup(to_platform_device(dev->dev)); + driver_data->cleanup(to_platform_device(dev->dev)); err_mode_config_cleanup: drm_mode_config_cleanup(dev); @@ -196,8 +196,8 @@ static int kirin_drm_platform_probe(struct platform_device *pdev) struct component_match *match = NULL; struct device_node *remote; - dc_ops = (struct kirin_dc_ops *)of_device_get_match_data(dev); - if (!dc_ops) { + driver_data = (struct kirin_drm_data *)of_device_get_match_data(dev); + if (!driver_data) { DRM_ERROR("failed to get dt id data\n"); return -EINVAL; } @@ -215,13 +215,13 @@ static int kirin_drm_platform_probe(struct platform_device *pdev) static int kirin_drm_platform_remove(struct platform_device *pdev) { component_master_del(&pdev->dev, &kirin_drm_ops); - dc_ops = NULL; + driver_data = NULL; return 0; } static const struct of_device_id kirin_drm_dt_ids[] = { { .compatible = "hisilicon,hi6220-ade", - .data = &ade_dc_ops, + .data = &ade_driver_data, }, { /* end node */ }, }; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index d47cbb427979..cd2eaa653db7 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -34,11 +34,11 @@ struct kirin_plane { }; /* display controller init/cleanup ops */ -struct kirin_dc_ops { +struct kirin_drm_data { int (*init)(struct platform_device *pdev); void (*cleanup)(struct platform_device *pdev); }; -extern const struct kirin_dc_ops ade_dc_ops; +extern struct kirin_drm_data ade_driver_data; #endif /* __KIRIN_DRM_DRV_H__ */