| Message ID | alpine.LNX.2.00.1011050026220.16015@swampdragon.chaosbits.net (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | f7dec88781dd3ad62ebd4acc515c8938c15353ac |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
On Fri, 5 Nov 2010, Jesper Juhl wrote: > On Tue, 2 Nov 2010, Michael Ellerman wrote: > > > On Mon, 2010-11-01 at 22:20 +0100, Jesper Juhl wrote: > > > Hi Stephen, > > > > > > On Tue, 2 Nov 2010, Stephen Rothwell wrote: > > > > > > > On Mon, 1 Nov 2010 21:06:23 +0100 (CET) Jesper Juhl <jj@chaosbits.net> wrote: > > > > > > > > > > Remove unused function 'mf_getSrcHistory' (that will never be used ever > > > > > according to Stephen Rothwell). > > > > > > > > > > Signed-off-by: Jesper Juhl <jj@chaosbits.net> > > > > > > > > Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> > > > > > > > > > > Ok, so if you are the (unofficial) iSeries maintainer and you don't merge > > > the patch somewhere that'll eventually go up-stream, but just ACK it > > > (thank you for that btw), then where do I send it to get it merged? > > > > Here. ie. linuxppc-dev. > > > > But, while you're removing it you should remove the #if 0'ed callsite as > > well, see mf_src_proc_show() in that file. :) > > > Done. See patch below. > > > Remove unused function 'mf_getSrcHistory' (that will never be used > ever according to Stephen Rothwell) and also remove most of (under 'if > 0') code from mf_src_proc_show() where the function was called. > > Signed-off-by: Jesper Juhl <jj@chaosbits.net> > --- > mf.c | 62 > -------------------------------------------------------------- > 1 file changed, 62 deletions(-) > > diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c > index 42d0a88..b5e026b 100644 > --- a/arch/powerpc/platforms/iseries/mf.c > +++ b/arch/powerpc/platforms/iseries/mf.c > @@ -1045,71 +1045,9 @@ static const struct file_operations mf_side_proc_fops = { > .write = mf_side_proc_write, > }; > > -#if 0 > -static void mf_getSrcHistory(char *buffer, int size) > -{ > - struct IplTypeReturnStuff return_stuff; > - struct pending_event *ev = new_pending_event(); > - int rc = 0; > - char *pages[4]; > - > - pages[0] = kmalloc(4096, GFP_ATOMIC); > - pages[1] = kmalloc(4096, GFP_ATOMIC); > - pages[2] = kmalloc(4096, GFP_ATOMIC); > - pages[3] = kmalloc(4096, GFP_ATOMIC); > - if ((ev == NULL) || (pages[0] == NULL) || (pages[1] == NULL) > - || (pages[2] == NULL) || (pages[3] == NULL)) > - return -ENOMEM; > - > - return_stuff.xType = 0; > - return_stuff.xRc = 0; > - return_stuff.xDone = 0; > - ev->event.hp_lp_event.xSubtype = 6; > - ev->event.hp_lp_event.x.xSubtypeData = > - subtype_data('M', 'F', 'V', 'I'); > - ev->event.data.vsp_cmd.xEvent = &return_stuff; > - ev->event.data.vsp_cmd.cmd = 4; > - ev->event.data.vsp_cmd.lp_index = HvLpConfig_getLpIndex(); > - ev->event.data.vsp_cmd.result_code = 0xFF; > - ev->event.data.vsp_cmd.reserved = 0; > - ev->event.data.vsp_cmd.sub_data.page[0] = iseries_hv_addr(pages[0]); > - ev->event.data.vsp_cmd.sub_data.page[1] = iseries_hv_addr(pages[1]); > - ev->event.data.vsp_cmd.sub_data.page[2] = iseries_hv_addr(pages[2]); > - ev->event.data.vsp_cmd.sub_data.page[3] = iseries_hv_addr(pages[3]); > - mb(); > - if (signal_event(ev) != 0) > - return; > - > - while (return_stuff.xDone != 1) > - udelay(10); > - if (return_stuff.xRc == 0) > - memcpy(buffer, pages[0], size); > - kfree(pages[0]); > - kfree(pages[1]); > - kfree(pages[2]); > - kfree(pages[3]); > -} > -#endif > - > static int mf_src_proc_show(struct seq_file *m, void *v) > { > -#if 0 > - int len; > - > - mf_getSrcHistory(page, count); > - len = count; > - len -= off; > - if (len < count) { > - *eof = 1; > - if (len <= 0) > - return 0; > - } else > - len = count; > - *start = page + off; > - return len; > -#else > return 0; > -#endif > } > > static int mf_src_proc_open(struct inode *inode, struct file *file) > > > > PING. Is this going to get merged somewhere or is there a problem?
On Fri, 19 Nov 2010, Michael Ellerman wrote: > On Thu, 2010-11-18 at 20:45 +0100, Jesper Juhl wrote: > > On Fri, 5 Nov 2010, Jesper Juhl wrote: > > > > > > static int mf_src_proc_open(struct inode *inode, struct file *file) > > > PING. > > > > Is this going to get merged somewhere or is there a problem? > > Yes, no. > > It won't get lost: > http://patchwork.ozlabs.org/patch/70201/ > Ok. Thank you for that bit of information. That was one place that I had no knowledge about what-so-ever, so I didn't look. I will now rest happily in the knowledge that the patch is in good hands. Thanks.
On Thu, 2010-11-18 at 20:45 +0100, Jesper Juhl wrote: > On Fri, 5 Nov 2010, Jesper Juhl wrote: > > > > static int mf_src_proc_open(struct inode *inode, struct file *file) > PING. > > Is this going to get merged somewhere or is there a problem? Yes, no. It won't get lost: http://patchwork.ozlabs.org/patch/70201/ cheers
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index 42d0a88..b5e026b 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c @@ -1045,71 +1045,9 @@ static const struct file_operations mf_side_proc_fops = { .write = mf_side_proc_write, }; -#if 0 -static void mf_getSrcHistory(char *buffer, int size) -{ - struct IplTypeReturnStuff return_stuff; - struct pending_event *ev = new_pending_event(); - int rc = 0; - char *pages[4]; - - pages[0] = kmalloc(4096, GFP_ATOMIC); - pages[1] = kmalloc(4096, GFP_ATOMIC); - pages[2] = kmalloc(4096, GFP_ATOMIC); - pages[3] = kmalloc(4096, GFP_ATOMIC); - if ((ev == NULL) || (pages[0] == NULL) || (pages[1] == NULL) - || (pages[2] == NULL) || (pages[3] == NULL)) - return -ENOMEM; - - return_stuff.xType = 0; - return_stuff.xRc = 0; - return_stuff.xDone = 0; - ev->event.hp_lp_event.xSubtype = 6; - ev->event.hp_lp_event.x.xSubtypeData = - subtype_data('M', 'F', 'V', 'I'); - ev->event.data.vsp_cmd.xEvent = &return_stuff; - ev->event.data.vsp_cmd.cmd = 4; - ev->event.data.vsp_cmd.lp_index = HvLpConfig_getLpIndex(); - ev->event.data.vsp_cmd.result_code = 0xFF; - ev->event.data.vsp_cmd.reserved = 0; - ev->event.data.vsp_cmd.sub_data.page[0] = iseries_hv_addr(pages[0]); - ev->event.data.vsp_cmd.sub_data.page[1] = iseries_hv_addr(pages[1]); - ev->event.data.vsp_cmd.sub_data.page[2] = iseries_hv_addr(pages[2]); - ev->event.data.vsp_cmd.sub_data.page[3] = iseries_hv_addr(pages[3]); - mb(); - if (signal_event(ev) != 0) - return; - - while (return_stuff.xDone != 1) - udelay(10); - if (return_stuff.xRc == 0) - memcpy(buffer, pages[0], size); - kfree(pages[0]); - kfree(pages[1]); - kfree(pages[2]); - kfree(pages[3]); -} -#endif - static int mf_src_proc_show(struct seq_file *m, void *v) { -#if 0 - int len; - - mf_getSrcHistory(page, count); - len = count; - len -= off; - if (len < count) { - *eof = 1; - if (len <= 0) - return 0; - } else - len = count; - *start = page + off; - return len; -#else return 0; -#endif } static int mf_src_proc_open(struct inode *inode, struct file *file)