From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oliver Hartkopp Subject: Re: [PATCH 1/2] peak_usb: rename usb option cmds definition and structs Date: Mon, 16 Mar 2015 12:21:06 +0100 Message-ID: <5506BCA2.5000302@hartkopp.net> References: <1426503473-7403-1-git-send-email-s.grosjean@peak-system.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.162]:36069 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972AbbCPLVS (ORCPT ); Mon, 16 Mar 2015 07:21:18 -0400 In-Reply-To: <1426503473-7403-1-git-send-email-s.grosjean@peak-system.com> Sender: linux-can-owner@vger.kernel.org List-ID: To: Stephane Grosjean , Marc Kleine-Budde Cc: linux-can Mailing List Both patches tested on Linux 4.0.0-rc4. Thanks Stephane! Tested-by: Oliver Hartkopp On 03/16/2015 11:57 AM, Stephane Grosjean wrote: > The PUCAN_CMD_RX_FRAME_(ENABLE|DISABLE) command has extended its purpose > and was therefore renamed to PUCAN_CMD_SET_(EN|DIS)_OPTION. > > Signed-off-by: Stephane Grosjean > Signed-off-by: Oliver Hartkopp > --- > drivers/net/can/usb/peak_usb/pcan_ucan.h | 14 +++++----- > drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 42 +++++++++++++++--------------- > 2 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/drivers/net/can/usb/peak_usb/pcan_ucan.h b/drivers/net/can/usb/peak_usb/pcan_ucan.h > index 1ba7c25..1fb3330 100644 > --- a/drivers/net/can/usb/peak_usb/pcan_ucan.h > +++ b/drivers/net/can/usb/peak_usb/pcan_ucan.h > @@ -26,8 +26,8 @@ > #define PUCAN_CMD_FILTER_STD 0x008 > #define PUCAN_CMD_TX_ABORT 0x009 > #define PUCAN_CMD_WR_ERR_CNT 0x00a > -#define PUCAN_CMD_RX_FRAME_ENABLE 0x00b > -#define PUCAN_CMD_RX_FRAME_DISABLE 0x00c > +#define PUCAN_CMD_SET_EN_OPTION 0x00b > +#define PUCAN_CMD_CLR_DIS_OPTION 0x00c > #define PUCAN_CMD_END_OF_COLLECTION 0x3ff > > /* uCAN received messages list */ > @@ -101,14 +101,14 @@ struct __packed pucan_wr_err_cnt { > u16 unused; > }; > > -/* uCAN RX_FRAME_ENABLE command fields */ > -#define PUCAN_FLTEXT_ERROR 0x0001 > -#define PUCAN_FLTEXT_BUSLOAD 0x0002 > +/* uCAN SET_EN/CLR_DIS _OPTION command fields */ > +#define PUCAN_OPTION_ERROR 0x0001 > +#define PUCAN_OPTION_BUSLOAD 0x0002 > > -struct __packed pucan_filter_ext { > +struct __packed pucan_options { > __le16 opcode_channel; > > - __le16 ext_mask; > + __le16 options; > u32 unused; > }; > > diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c > index 0bac0f1..7506a83 100644 > --- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c > +++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c > @@ -110,13 +110,13 @@ struct __packed pcan_ufd_led { > u8 unused[5]; > }; > > -/* Extended usage of uCAN commands CMD_RX_FRAME_xxxABLE for PCAN-USB Pro FD */ > +/* Extended usage of uCAN commands CMD_xxx_xx_OPTION for PCAN-USB Pro FD */ > #define PCAN_UFD_FLTEXT_CALIBRATION 0x8000 > > -struct __packed pcan_ufd_filter_ext { > +struct __packed pcan_ufd_options { > __le16 opcode_channel; > > - __le16 ext_mask; > + __le16 ucan_mask; > u16 unused; > __le16 usb_mask; > }; > @@ -321,21 +321,21 @@ static int pcan_usb_fd_set_filter_std(struct peak_usb_device *dev, int idx, > return pcan_usb_fd_send_cmd(dev, cmd); > } > > -/* set/unset notifications filter: > +/* set/unset options > * > - * onoff sets(1)/unset(0) notifications > - * mask each bit defines a kind of notification to set/unset > + * onoff set(1)/unset(0) options > + * mask each bit defines a kind of options to set/unset > */ > -static int pcan_usb_fd_set_filter_ext(struct peak_usb_device *dev, > - bool onoff, u16 ext_mask, u16 usb_mask) > +static int pcan_usb_fd_set_options(struct peak_usb_device *dev, > + bool onoff, u16 ucan_mask, u16 usb_mask) > { > - struct pcan_ufd_filter_ext *cmd = pcan_usb_fd_cmd_buffer(dev); > + struct pcan_ufd_options *cmd = pcan_usb_fd_cmd_buffer(dev); > > cmd->opcode_channel = pucan_cmd_opcode_channel(dev, > - (onoff) ? PUCAN_CMD_RX_FRAME_ENABLE : > - PUCAN_CMD_RX_FRAME_DISABLE); > + (onoff) ? PUCAN_CMD_SET_EN_OPTION : > + PUCAN_CMD_CLR_DIS_OPTION); > > - cmd->ext_mask = cpu_to_le16(ext_mask); > + cmd->ucan_mask = cpu_to_le16(ucan_mask); > cmd->usb_mask = cpu_to_le16(usb_mask); > > /* send the command */ > @@ -770,9 +770,9 @@ static int pcan_usb_fd_start(struct peak_usb_device *dev) > &pcan_usb_pro_fd); > > /* enable USB calibration messages */ > - err = pcan_usb_fd_set_filter_ext(dev, 1, > - PUCAN_FLTEXT_ERROR, > - PCAN_UFD_FLTEXT_CALIBRATION); > + err = pcan_usb_fd_set_options(dev, 1, > + PUCAN_OPTION_ERROR, > + PCAN_UFD_FLTEXT_CALIBRATION); > } > > pdev->usb_if->dev_opened_count++; > @@ -806,9 +806,9 @@ static int pcan_usb_fd_stop(struct peak_usb_device *dev) > > /* turn off special msgs for that interface if no other dev opened */ > if (pdev->usb_if->dev_opened_count == 1) > - pcan_usb_fd_set_filter_ext(dev, 0, > - PUCAN_FLTEXT_ERROR, > - PCAN_UFD_FLTEXT_CALIBRATION); > + pcan_usb_fd_set_options(dev, 0, > + PUCAN_OPTION_ERROR, > + PCAN_UFD_FLTEXT_CALIBRATION); > pdev->usb_if->dev_opened_count--; > > return 0; > @@ -937,9 +937,9 @@ static void pcan_usb_fd_exit(struct peak_usb_device *dev) > if (dev->ctrl_idx == 0) { > /* turn off calibration message if any device were opened */ > if (pdev->usb_if->dev_opened_count > 0) > - pcan_usb_fd_set_filter_ext(dev, 0, > - PUCAN_FLTEXT_ERROR, > - PCAN_UFD_FLTEXT_CALIBRATION); > + pcan_usb_fd_set_options(dev, 0, > + PUCAN_OPTION_ERROR, > + PCAN_UFD_FLTEXT_CALIBRATION); > > /* tell USB adapter that the driver is being unloaded */ > pcan_usb_fd_drv_loaded(dev, 0); >