From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Rob Herring <robh+dt@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J . Wysocki" <rafael@kernel.org> Cc: od@zcrc.me, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil <paul@crapouillou.net> Subject: [PATCH 03/12] component: Support binding with no matches Date: Sat, 16 May 2020 23:50:48 +0200 [thread overview] Message-ID: <20200516215057.392609-3-paul@crapouillou.net> (raw) In-Reply-To: <20200516215057.392609-1-paul@crapouillou.net> Support binding the master even though no components have been registered. This permits to support cases where components are optional. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/base/component.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/base/component.c b/drivers/base/component.c index e97704104784..a9de7ee1677f 100644 --- a/drivers/base/component.c +++ b/drivers/base/component.c @@ -100,7 +100,7 @@ static int component_devices_show(struct seq_file *s, void *data) seq_printf(s, "%-40s %20s\n", "device name", "status"); seq_puts(s, "-------------------------------------------------------------\n"); - for (i = 0; i < match->num; i++) { + for (i = 0; !!match && i < match->num; i++) { struct component *component = match->compare[i].component; seq_printf(s, "%-40s %20s\n", @@ -184,6 +184,11 @@ static int find_components(struct master *master) size_t i; int ret = 0; + if (!match) { + dev_dbg(master->dev, "No components\n"); + return 0; + } + /* * Scan the array of match functions and attach * any components which are found to this master. @@ -218,10 +223,12 @@ static void remove_component(struct master *master, struct component *c) { size_t i; - /* Detach the component from this master. */ - for (i = 0; i < master->match->num; i++) - if (master->match->compare[i].component == c) - master->match->compare[i].component = NULL; + if (master->match) { + /* Detach the component from this master. */ + for (i = 0; i < master->match->num; i++) + if (master->match->compare[i].component == c) + master->match->compare[i].component = NULL; + } } /* @@ -470,10 +477,12 @@ int component_master_add_with_match(struct device *dev, struct master *master; int ret; - /* Reallocate the match array for its true size */ - ret = component_match_realloc(dev, match, match->num); - if (ret) - return ret; + if (match) { + /* Reallocate the match array for its true size */ + ret = component_match_realloc(dev, match, match->num); + if (ret) + return ret; + } master = kzalloc(sizeof(*master), GFP_KERNEL); if (!master) @@ -557,6 +566,10 @@ void component_unbind_all(struct device *master_dev, void *data) if (!master) return; + /* No match, nothing to unbind */ + if (!master->match) + return; + /* Unbind components in reverse order */ for (i = master->match->num; i--; ) if (!master->match->compare[i].duplicate) { @@ -640,6 +653,10 @@ int component_bind_all(struct device *master_dev, void *data) if (!master) return -EINVAL; + /* No match, nothing to bind */ + if (!master->match) + return 0; + /* Bind components in match order */ for (i = 0; i < master->match->num; i++) if (!master->match->compare[i].duplicate) { -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Rob Herring <robh+dt@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J . Wysocki" <rafael@kernel.org> Cc: Paul Cercueil <paul@crapouillou.net>, devicetree@vger.kernel.org, od@zcrc.me, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 03/12] component: Support binding with no matches Date: Sat, 16 May 2020 23:50:48 +0200 [thread overview] Message-ID: <20200516215057.392609-3-paul@crapouillou.net> (raw) In-Reply-To: <20200516215057.392609-1-paul@crapouillou.net> Support binding the master even though no components have been registered. This permits to support cases where components are optional. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/base/component.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/base/component.c b/drivers/base/component.c index e97704104784..a9de7ee1677f 100644 --- a/drivers/base/component.c +++ b/drivers/base/component.c @@ -100,7 +100,7 @@ static int component_devices_show(struct seq_file *s, void *data) seq_printf(s, "%-40s %20s\n", "device name", "status"); seq_puts(s, "-------------------------------------------------------------\n"); - for (i = 0; i < match->num; i++) { + for (i = 0; !!match && i < match->num; i++) { struct component *component = match->compare[i].component; seq_printf(s, "%-40s %20s\n", @@ -184,6 +184,11 @@ static int find_components(struct master *master) size_t i; int ret = 0; + if (!match) { + dev_dbg(master->dev, "No components\n"); + return 0; + } + /* * Scan the array of match functions and attach * any components which are found to this master. @@ -218,10 +223,12 @@ static void remove_component(struct master *master, struct component *c) { size_t i; - /* Detach the component from this master. */ - for (i = 0; i < master->match->num; i++) - if (master->match->compare[i].component == c) - master->match->compare[i].component = NULL; + if (master->match) { + /* Detach the component from this master. */ + for (i = 0; i < master->match->num; i++) + if (master->match->compare[i].component == c) + master->match->compare[i].component = NULL; + } } /* @@ -470,10 +477,12 @@ int component_master_add_with_match(struct device *dev, struct master *master; int ret; - /* Reallocate the match array for its true size */ - ret = component_match_realloc(dev, match, match->num); - if (ret) - return ret; + if (match) { + /* Reallocate the match array for its true size */ + ret = component_match_realloc(dev, match, match->num); + if (ret) + return ret; + } master = kzalloc(sizeof(*master), GFP_KERNEL); if (!master) @@ -557,6 +566,10 @@ void component_unbind_all(struct device *master_dev, void *data) if (!master) return; + /* No match, nothing to unbind */ + if (!master->match) + return; + /* Unbind components in reverse order */ for (i = master->match->num; i--; ) if (!master->match->compare[i].duplicate) { @@ -640,6 +653,10 @@ int component_bind_all(struct device *master_dev, void *data) if (!master) return -EINVAL; + /* No match, nothing to bind */ + if (!master->match) + return 0; + /* Bind components in match order */ for (i = 0; i < master->match->num; i++) if (!master->match->compare[i].duplicate) { -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-16 21:51 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-16 21:50 [PATCH 01/12] dt-bindings: display: Convert ingenic,lcd.txt to YAML Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-16 21:50 ` [PATCH 02/12] dt-bindings: display: Add ingenic,ipu.yaml Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-17 6:17 ` Sam Ravnborg 2020-05-17 6:17 ` Sam Ravnborg 2020-05-17 11:06 ` Paul Cercueil 2020-05-17 11:06 ` Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil [this message] 2020-05-16 21:50 ` [PATCH 03/12] component: Support binding with no matches Paul Cercueil 2020-05-16 21:50 ` [PATCH 04/12] gpu/drm: ingenic: Fix bogus crtc_atomic_check callback Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-17 6:17 ` Sam Ravnborg 2020-05-17 6:17 ` Sam Ravnborg 2020-05-17 12:19 ` Paul Cercueil 2020-05-17 12:19 ` Paul Cercueil 2020-05-16 21:50 ` [PATCH 05/12] gpu/drm: Ingenic: Fix opaque pointer casted to wrong type Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-17 6:21 ` Sam Ravnborg 2020-05-17 6:21 ` Sam Ravnborg 2020-05-17 12:19 ` Paul Cercueil 2020-05-17 12:19 ` Paul Cercueil 2020-05-16 21:50 ` [PATCH 06/12] gpu/drm: Ingenic: Fix incorrect assumption about plane->index Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-19 11:49 ` Sasha Levin 2020-05-19 11:49 ` Sasha Levin 2020-05-16 21:50 ` [PATCH 07/12] gpu/drm: ingenic: Set DMA descriptor chain address in probe Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-16 21:50 ` [PATCH 08/12] gpu/drm: Ingenic: Move register definitions to ingenic-drm.h Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-16 21:50 ` [PATCH 09/12] gpu/drm: Ingenic: Add support for OSD mode Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-16 21:50 ` [PATCH 10/12] gpu/drm: Ingenic: Register driver as component master Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-16 21:50 ` [PATCH 11/12] gpu/drm: Ingenic: Add support for the IPU Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-18 10:48 ` Emil Velikov 2020-05-18 10:48 ` Emil Velikov 2020-05-18 11:26 ` Paul Cercueil 2020-05-18 11:26 ` Paul Cercueil 2020-05-19 17:10 ` Paul Boddie 2020-05-19 17:10 ` Paul Boddie 2020-05-16 21:50 ` [PATCH 12/12] gpu/drm: Ingenic: Support multiple panels/bridges Paul Cercueil 2020-05-16 21:50 ` Paul Cercueil 2020-05-17 6:12 ` [PATCH 01/12] dt-bindings: display: Convert ingenic,lcd.txt to YAML Sam Ravnborg 2020-05-17 6:12 ` Sam Ravnborg 2020-05-28 20:17 ` Rob Herring 2020-05-28 20:17 ` Rob Herring
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200516215057.392609-3-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=od@zcrc.me \ --cc=rafael@kernel.org \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.