From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrzej Pietrasiewicz Date: Mon, 28 Sep 2015 13:47:43 +0200 Subject: [Cluster-devel] [PATCH 08/23] usb-gadget/f_midi: use per-attribute show and store methods In-Reply-To: <1443189000-13398-9-git-send-email-hch@lst.de> References: <1443189000-13398-1-git-send-email-hch@lst.de> <1443189000-13398-9-git-send-email-hch@lst.de> Message-ID: <560928DF.5040605@samsung.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit W dniu 25.09.2015 o 15:49, Christoph Hellwig pisze: > Signed-off-by: Christoph Hellwig Reviewed-by: Andrzej Pietrasiewicz > --- > drivers/usb/gadget/function/f_midi.c | 37 ++++++++++++++++-------------------- > 1 file changed, 16 insertions(+), 21 deletions(-) > > diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c > index a287a48..0e2b8ed 100644 > --- a/drivers/usb/gadget/function/f_midi.c > +++ b/drivers/usb/gadget/function/f_midi.c > @@ -906,9 +906,6 @@ static inline struct f_midi_opts *to_f_midi_opts(struct config_item *item) > func_inst.group); > } > > -CONFIGFS_ATTR_STRUCT(f_midi_opts); > -CONFIGFS_ATTR_OPS(f_midi_opts); > - > static void midi_attr_release(struct config_item *item) > { > struct f_midi_opts *opts = to_f_midi_opts(item); > @@ -918,13 +915,12 @@ static void midi_attr_release(struct config_item *item) > > static struct configfs_item_operations midi_item_ops = { > .release = midi_attr_release, > - .show_attribute = f_midi_opts_attr_show, > - .store_attribute = f_midi_opts_attr_store, > }; > > #define F_MIDI_OPT(name, test_limit, limit) \ > -static ssize_t f_midi_opts_##name##_show(struct f_midi_opts *opts, char *page) \ > +static ssize_t f_midi_opts_##name##_show(struct config_item *item, char *page) \ > { \ > + struct f_midi_opts *opts = to_f_midi_opts(item); \ > int result; \ > \ > mutex_lock(&opts->lock); \ > @@ -934,9 +930,10 @@ static ssize_t f_midi_opts_##name##_show(struct f_midi_opts *opts, char *page) \ > return result; \ > } \ > \ > -static ssize_t f_midi_opts_##name##_store(struct f_midi_opts *opts, \ > +static ssize_t f_midi_opts_##name##_store(struct config_item *item, \ > const char *page, size_t len) \ > { \ > + struct f_midi_opts *opts = to_f_midi_opts(item); \ > int ret; \ > u32 num; \ > \ > @@ -962,9 +959,7 @@ end: \ > return ret; \ > } \ > \ > -static struct f_midi_opts_attribute f_midi_opts_##name = \ > - __CONFIGFS_ATTR(name, S_IRUGO | S_IWUSR, f_midi_opts_##name##_show, \ > - f_midi_opts_##name##_store) > +CONFIGFS_ATTR(f_midi_opts_, name); > > F_MIDI_OPT(index, true, SNDRV_CARDS); > F_MIDI_OPT(buflen, false, 0); > @@ -972,8 +967,9 @@ F_MIDI_OPT(qlen, false, 0); > F_MIDI_OPT(in_ports, true, MAX_PORTS); > F_MIDI_OPT(out_ports, true, MAX_PORTS); > > -static ssize_t f_midi_opts_id_show(struct f_midi_opts *opts, char *page) > +static ssize_t f_midi_opts_id_show(struct config_item *item, char *page) > { > + struct f_midi_opts *opts = to_f_midi_opts(item); > int result; > > mutex_lock(&opts->lock); > @@ -989,9 +985,10 @@ static ssize_t f_midi_opts_id_show(struct f_midi_opts *opts, char *page) > return result; > } > > -static ssize_t f_midi_opts_id_store(struct f_midi_opts *opts, > +static ssize_t f_midi_opts_id_store(struct config_item *item, > const char *page, size_t len) > { > + struct f_midi_opts *opts = to_f_midi_opts(item); > int ret; > char *c; > > @@ -1016,17 +1013,15 @@ end: > return ret; > } > > -static struct f_midi_opts_attribute f_midi_opts_id = > - __CONFIGFS_ATTR(id, S_IRUGO | S_IWUSR, f_midi_opts_id_show, > - f_midi_opts_id_store); > +CONFIGFS_ATTR(f_midi_opts_, id); > > static struct configfs_attribute *midi_attrs[] = { > - &f_midi_opts_index.attr, > - &f_midi_opts_buflen.attr, > - &f_midi_opts_qlen.attr, > - &f_midi_opts_in_ports.attr, > - &f_midi_opts_out_ports.attr, > - &f_midi_opts_id.attr, > + &f_midi_opts_attr_index, > + &f_midi_opts_attr_buflen, > + &f_midi_opts_attr_qlen, > + &f_midi_opts_attr_in_ports, > + &f_midi_opts_attr_out_ports, > + &f_midi_opts_attr_id, > NULL, > }; > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrzej Pietrasiewicz Subject: Re: [PATCH 08/23] usb-gadget/f_midi: use per-attribute show and store methods Date: Mon, 28 Sep 2015 13:47:43 +0200 Message-ID: <560928DF.5040605@samsung.com> References: <1443189000-13398-1-git-send-email-hch@lst.de> <1443189000-13398-9-git-send-email-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-2; format=flowed Content-Transfer-Encoding: 7bit Cc: Felipe Balbi , Tejun Heo , Pratyush Anand , target-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cluster-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, ocfs2-devel-N0ozoZBvEnrZJqsBc5GL+g@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Christoph Hellwig , Joel Becker , Andrew Morton Return-path: In-reply-to: <1443189000-13398-9-git-send-email-hch-jcswGhMUV9g@public.gmane.org> Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org W dniu 25.09.2015 o 15:49, Christoph Hellwig pisze: > Signed-off-by: Christoph Hellwig Reviewed-by: Andrzej Pietrasiewicz > --- > drivers/usb/gadget/function/f_midi.c | 37 ++++++++++++++++-------------------- > 1 file changed, 16 insertions(+), 21 deletions(-) > > diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c > index a287a48..0e2b8ed 100644 > --- a/drivers/usb/gadget/function/f_midi.c > +++ b/drivers/usb/gadget/function/f_midi.c > @@ -906,9 +906,6 @@ static inline struct f_midi_opts *to_f_midi_opts(struct config_item *item) > func_inst.group); > } > > -CONFIGFS_ATTR_STRUCT(f_midi_opts); > -CONFIGFS_ATTR_OPS(f_midi_opts); > - > static void midi_attr_release(struct config_item *item) > { > struct f_midi_opts *opts = to_f_midi_opts(item); > @@ -918,13 +915,12 @@ static void midi_attr_release(struct config_item *item) > > static struct configfs_item_operations midi_item_ops = { > .release = midi_attr_release, > - .show_attribute = f_midi_opts_attr_show, > - .store_attribute = f_midi_opts_attr_store, > }; > > #define F_MIDI_OPT(name, test_limit, limit) \ > -static ssize_t f_midi_opts_##name##_show(struct f_midi_opts *opts, char *page) \ > +static ssize_t f_midi_opts_##name##_show(struct config_item *item, char *page) \ > { \ > + struct f_midi_opts *opts = to_f_midi_opts(item); \ > int result; \ > \ > mutex_lock(&opts->lock); \ > @@ -934,9 +930,10 @@ static ssize_t f_midi_opts_##name##_show(struct f_midi_opts *opts, char *page) \ > return result; \ > } \ > \ > -static ssize_t f_midi_opts_##name##_store(struct f_midi_opts *opts, \ > +static ssize_t f_midi_opts_##name##_store(struct config_item *item, \ > const char *page, size_t len) \ > { \ > + struct f_midi_opts *opts = to_f_midi_opts(item); \ > int ret; \ > u32 num; \ > \ > @@ -962,9 +959,7 @@ end: \ > return ret; \ > } \ > \ > -static struct f_midi_opts_attribute f_midi_opts_##name = \ > - __CONFIGFS_ATTR(name, S_IRUGO | S_IWUSR, f_midi_opts_##name##_show, \ > - f_midi_opts_##name##_store) > +CONFIGFS_ATTR(f_midi_opts_, name); > > F_MIDI_OPT(index, true, SNDRV_CARDS); > F_MIDI_OPT(buflen, false, 0); > @@ -972,8 +967,9 @@ F_MIDI_OPT(qlen, false, 0); > F_MIDI_OPT(in_ports, true, MAX_PORTS); > F_MIDI_OPT(out_ports, true, MAX_PORTS); > > -static ssize_t f_midi_opts_id_show(struct f_midi_opts *opts, char *page) > +static ssize_t f_midi_opts_id_show(struct config_item *item, char *page) > { > + struct f_midi_opts *opts = to_f_midi_opts(item); > int result; > > mutex_lock(&opts->lock); > @@ -989,9 +985,10 @@ static ssize_t f_midi_opts_id_show(struct f_midi_opts *opts, char *page) > return result; > } > > -static ssize_t f_midi_opts_id_store(struct f_midi_opts *opts, > +static ssize_t f_midi_opts_id_store(struct config_item *item, > const char *page, size_t len) > { > + struct f_midi_opts *opts = to_f_midi_opts(item); > int ret; > char *c; > > @@ -1016,17 +1013,15 @@ end: > return ret; > } > > -static struct f_midi_opts_attribute f_midi_opts_id = > - __CONFIGFS_ATTR(id, S_IRUGO | S_IWUSR, f_midi_opts_id_show, > - f_midi_opts_id_store); > +CONFIGFS_ATTR(f_midi_opts_, id); > > static struct configfs_attribute *midi_attrs[] = { > - &f_midi_opts_index.attr, > - &f_midi_opts_buflen.attr, > - &f_midi_opts_qlen.attr, > - &f_midi_opts_in_ports.attr, > - &f_midi_opts_out_ports.attr, > - &f_midi_opts_id.attr, > + &f_midi_opts_attr_index, > + &f_midi_opts_attr_buflen, > + &f_midi_opts_attr_qlen, > + &f_midi_opts_attr_in_ports, > + &f_midi_opts_attr_out_ports, > + &f_midi_opts_attr_id, > NULL, > }; > > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html