[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAK8P3a3Qw6YraHveY4MW=3u-q5YyOzM3X8V9Q=X7Wr4=1gApGg@mail.gmail.com>
Date: Wed, 24 Oct 2018 08:11:09 +0100
From: Arnd Bergmann <arnd@...db.de>
To: Al Cooper <alcooperx@...il.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Alan Stern <stern@...land.harvard.edu>,
Alban Bedel <albeu@...e.fr>, Alex Elder <elder@...aro.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Avi Fishman <avifishman70@...il.com>,
bcm-kernel-feedback-list@...adcom.com,
Bjorn Andersson <bjorn.andersson@...aro.org>,
Chunfeng Yun <chunfeng.yun@...iatek.com>,
David Miller <davem@...emloft.net>,
DTML <devicetree@...r.kernel.org>,
Dmitry Osipenko <digetx@...il.com>,
gregkh <gregkh@...uxfoundation.org>,
"Gustavo A. R. Silva" <gustavo@...eddedor.com>,
Hans de Goede <hdegoede@...hat.com>,
James Hogan <jhogan@...nel.org>, sunjianguo1@...wei.com,
Johan Hovold <johan@...nel.org>,
Kees Cook <keescook@...omium.org>,
USB list <linux-usb@...r.kernel.org>,
Lu Baolu <baolu.lu@...ux.intel.com>,
Mark Rutland <mark.rutland@....com>,
Martin Blumenstingl <martin.blumenstingl@...glemail.com>,
Mathias Nyman <mathias.nyman@...el.com>,
Mathias Nyman <mathias.nyman@...ux.intel.com>,
Mauro Carvalho Chehab <mchehab+samsung@...nel.org>,
rishabhb@...eaurora.org, Rob Herring <robh+dt@...nel.org>,
Roger Quadros <rogerq@...com>
Subject: Re: [PATCH V2 4/6] usb: ohci-platform: Add support for Broadcom STB SoC's
On Wed, Oct 17, 2018 at 11:30 PM Al Cooper <alcooperx@...il.com> wrote:
>
> Add support for Broadcom STB SoC's to the ohci platform driver.
>
> Signed-off-by: Al Cooper <alcooperx@...il.com>
> ---
> drivers/usb/host/ohci-platform.c | 35 +++++++++++++++++++++++++++++------
> include/linux/usb/ohci_pdriver.h | 1 +
> 2 files changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
> index 65a1c3fdc88c..363d6fa676a5 100644
> --- a/drivers/usb/host/ohci-platform.c
> +++ b/drivers/usb/host/ohci-platform.c
> @@ -22,6 +22,7 @@
> #include <linux/module.h>
> #include <linux/err.h>
> #include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/reset.h>
> @@ -99,12 +100,24 @@ static int ohci_platform_probe(struct platform_device *dev)
> if (usb_disabled())
> return -ENODEV;
>
> - /*
> - * Use reasonable defaults so platforms don't have to provide these
> - * with DT probing on ARM.
> - */
> - if (!pdata)
> - pdata = &ohci_platform_defaults;
> + if (!pdata) {
> + const struct usb_ohci_pdata *match_pdata;
> +
> + match_pdata = of_device_get_match_data(&dev->dev);
> + if (match_pdata) {
> + pdata = devm_kzalloc(&dev->dev, sizeof(*pdata),
> + GFP_KERNEL);
> + if (!pdata)
> + return -ENOMEM;
> + *pdata = *match_pdata;
It looks like you copy the const pdata to get a non-const version.
Have you tried
propagating the 'const' modifier so that users can rely on that here?
> + } else {
> + /*
> + * Use reasonable defaults so platforms don't have
> + * to provide these with DT probing on ARM.
> + */
> + pdata = &ohci_platform_defaults;
> + }
> + }
That would also allow you to unify it with the else path by listing
the ohci_platform_defaults
in the id table for all other compatible strings.
Arnd
Powered by blists - more mailing lists