From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v2 3/4] mfd: dln2: add start/stop RX URBs helpers Date: Sun, 18 Jan 2015 17:49:34 +0000 Message-ID: <20150118174934.GH3574@x1> References: <1418745435-2851-1-git-send-email-octavian.purdila@intel.com> <1418745435-2851-4-git-send-email-octavian.purdila@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-ig0-f179.google.com ([209.85.213.179]:55756 "EHLO mail-ig0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751609AbbARRtj (ORCPT ); Sun, 18 Jan 2015 12:49:39 -0500 Received: by mail-ig0-f179.google.com with SMTP id l13so9980920iga.0 for ; Sun, 18 Jan 2015 09:49:39 -0800 (PST) Content-Disposition: inline In-Reply-To: <1418745435-2851-4-git-send-email-octavian.purdila@intel.com> Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Octavian Purdila Cc: linus.walleij@linaro.org, johan@kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org On Tue, 16 Dec 2014, Octavian Purdila wrote: > This is in preparation for adding suspend / resume support. Please re-submit this set with the Acks you have received. Also draft a cover-letter with the current status of set, what you need next etc. > Signed-off-by: Octavian Purdila > --- > drivers/mfd/dln2.c | 51 +++++++++++++++++++++++++++++++++++++++++---= ------- > 1 file changed, 41 insertions(+), 10 deletions(-) >=20 > diff --git a/drivers/mfd/dln2.c b/drivers/mfd/dln2.c > index 6d49685..75358d2 100644 > --- a/drivers/mfd/dln2.c > +++ b/drivers/mfd/dln2.c > @@ -587,12 +587,19 @@ static void dln2_free_rx_urbs(struct dln2_dev *= dln2) > int i; > =20 > for (i =3D 0; i < DLN2_MAX_URBS; i++) { > - usb_kill_urb(dln2->rx_urb[i]); > usb_free_urb(dln2->rx_urb[i]); > kfree(dln2->rx_buf[i]); > } > } > =20 > +static void dln2_stop_rx_urbs(struct dln2_dev *dln2) > +{ > + int i; > + > + for (i =3D 0; i < DLN2_MAX_URBS; i++) > + usb_kill_urb(dln2->rx_urb[i]); > +} > + > static void dln2_free(struct dln2_dev *dln2) > { > dln2_free_rx_urbs(dln2); > @@ -604,9 +611,7 @@ static int dln2_setup_rx_urbs(struct dln2_dev *dl= n2, > struct usb_host_interface *hostif) > { > int i; > - int ret; > const int rx_max_size =3D DLN2_RX_BUF_SIZE; > - struct device *dev =3D &dln2->interface->dev; > =20 > for (i =3D 0; i < DLN2_MAX_URBS; i++) { > dln2->rx_buf[i] =3D kmalloc(rx_max_size, GFP_KERNEL); > @@ -621,7 +626,19 @@ static int dln2_setup_rx_urbs(struct dln2_dev *d= ln2, > usb_rcvbulkpipe(dln2->usb_dev, dln2->ep_in), > dln2->rx_buf[i], rx_max_size, dln2_rx, dln2); > =20 > - ret =3D usb_submit_urb(dln2->rx_urb[i], GFP_KERNEL); > + } > + > + return 0; > +} > + > +static int dln2_start_rx_urbs(struct dln2_dev *dln2, gfp_t gfp) > +{ > + struct device *dev =3D &dln2->interface->dev; > + int ret; > + int i; > + > + for (i =3D 0; i < DLN2_MAX_URBS; i++) { > + ret =3D usb_submit_urb(dln2->rx_urb[i], gfp); > if (ret < 0) { > dev_err(dev, "failed to submit RX URB: %d\n", ret); > return ret; > @@ -665,9 +682,8 @@ static const struct mfd_cell dln2_devs[] =3D { > }, > }; > =20 > -static void dln2_disconnect(struct usb_interface *interface) > +static void dln2_stop(struct dln2_dev *dln2) > { > - struct dln2_dev *dln2 =3D usb_get_intfdata(interface); > int i, j; > =20 > /* don't allow starting new transfers */ > @@ -696,6 +712,14 @@ static void dln2_disconnect(struct usb_interface= *interface) > /* wait for transfers to end */ > wait_event(dln2->disconnect_wq, !dln2->active_transfers); > =20 > + dln2_stop_rx_urbs(dln2); > +} > +static void dln2_disconnect(struct usb_interface *interface) > +{ > + struct dln2_dev *dln2 =3D usb_get_intfdata(interface); > + > + dln2_stop(dln2); > + > mfd_remove_devices(&interface->dev); > =20 > dln2_free(dln2); > @@ -738,23 +762,30 @@ static int dln2_probe(struct usb_interface *int= erface, > =20 > ret =3D dln2_setup_rx_urbs(dln2, hostif); > if (ret) > - goto out_cleanup; > + goto out_free; > + > + ret =3D dln2_start_rx_urbs(dln2, GFP_KERNEL); > + if (ret) > + goto out_stop_rx; > =20 > ret =3D dln2_hw_init(dln2); > if (ret < 0) { > dev_err(dev, "failed to initialize hardware\n"); > - goto out_cleanup; > + goto out_stop_rx; > } > =20 > ret =3D mfd_add_hotplug_devices(dev, dln2_devs, ARRAY_SIZE(dln2_dev= s)); > if (ret !=3D 0) { > dev_err(dev, "failed to add mfd devices to core\n"); > - goto out_cleanup; > + goto out_stop_rx; > } > =20 > return 0; > =20 > -out_cleanup: > +out_stop_rx: > + dln2_stop_rx_urbs(dln2); > + > +out_free: > dln2_free(dln2); > =20 > return ret; --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html