diff for duplicates of <49DDC6CB.50607@fastmail.fm> diff --git a/a/1.txt b/N1/1.txt index 012fc2f..eb681f7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,8 @@ Jack Stone wrote: > +++ b/drivers/isdn/hardware/eicon/capifunc.c > @@ -1072,7 +1072,7 @@ static int divacapi_connect_didd(void) > req.didd_notify.e.Req = 0; -> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; +> req.didd_notify.e.Rc = +> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; > - req.didd_notify.info.callback = (void *)didd_callback; > + req.didd_notify.info.callback = didd_callback; > req.didd_notify.info.context = NULL; @@ -48,7 +49,8 @@ Jack Stone wrote: > +++ b/drivers/isdn/hardware/eicon/diddfunc.c > @@ -63,7 +63,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void) > req.didd_notify.e.Req = 0; -> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; +> req.didd_notify.e.Rc = +> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; > - req.didd_notify.info.callback = (void *)didd_callback; > + req.didd_notify.info.callback = didd_callback; > req.didd_notify.info.context = NULL; @@ -61,7 +63,8 @@ Jack Stone wrote: > +++ b/drivers/isdn/hardware/eicon/divasfunc.c > @@ -170,7 +170,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void) > req.didd_notify.e.Req = 0; -> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; +> req.didd_notify.e.Rc = +> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; > - req.didd_notify.info.callback = (void *)didd_callback; > + req.didd_notify.info.callback = didd_callback; > req.didd_notify.info.context = NULL; @@ -78,7 +81,8 @@ Jack Stone wrote: > } > > - if (! -> - (p_os > - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file-> +> - (p_os = +> - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file-> > - private_data))) > - { > + if (!(p_os = diva_um_id_get_os_context(file-> private_data))) { @@ -103,7 +107,8 @@ Jack Stone wrote: > return (-ENODEV); > } > -> - if (!(p_os > - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file-> +> - if (!(p_os = +> - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file-> > - private_data))) > - { > + if (!(p_os = diva_um_id_get_os_context(file->private_data))) { @@ -118,7 +123,8 @@ Jack Stone wrote: > return (POLLERR); > } > -> - if ((!(p_os > - (diva_um_idi_os_context_t *) +> - if ((!(p_os = +> - (diva_um_idi_os_context_t *) > - diva_um_id_get_os_context(file->private_data))) > + if ((!(p_os = diva_um_id_get_os_context(file->private_data))) > || p_os->aborted) { @@ -129,7 +135,8 @@ Jack Stone wrote: > goto out; > } > -> - if (!(p_os > - (diva_um_idi_os_context_t *) +> - if (!(p_os = +> - (diva_um_idi_os_context_t *) > diva_um_id_get_os_context(file->private_data))) { > + if (!(p_os = diva_um_id_get_os_context(file->private_data))) { > ret = -ENODEV; @@ -139,7 +146,8 @@ Jack Stone wrote: > return (0); > } > -> - if (!(p_os > - (diva_um_idi_os_context_t *) +> - if (!(p_os = +> - (diva_um_idi_os_context_t *) > - diva_um_id_get_os_context(entity))) { > + if (!(p_os = diva_um_id_get_os_context(entity))) { > DBG_FTL(("Zero entity os context on remove")) @@ -149,7 +157,8 @@ Jack Stone wrote: > diva_um_idi_os_context_t *p_os; > > if (entity && -> - ((p_os > - (diva_um_idi_os_context_t *) +> - ((p_os = +> - (diva_um_idi_os_context_t *) > - diva_um_id_get_os_context(entity)))) { > + ((p_os = diva_um_id_get_os_context(entity)))) { > mod_timer(&p_os->diva_timer_id, jiffies + 10 * HZ); @@ -159,7 +168,8 @@ Jack Stone wrote: > diva_um_idi_os_context_t *p_os; > > if (entity && -> - ((p_os > - (diva_um_idi_os_context_t *) +> - ((p_os = +> - (diva_um_idi_os_context_t *) > - diva_um_id_get_os_context(entity)))) { > + ((p_os = diva_um_id_get_os_context(entity)))) { > del_timer(&p_os->diva_timer_id); @@ -172,7 +182,8 @@ Jack Stone wrote: > +++ b/drivers/isdn/hardware/eicon/idifunc.c > @@ -197,7 +197,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void) > req.didd_notify.e.Req = 0; -> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; +> req.didd_notify.e.Rc = +> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; > - req.didd_notify.info.callback = (void *)didd_callback; > + req.didd_notify.info.callback = didd_callback; > req.didd_notify.info.context = NULL; @@ -185,7 +196,8 @@ Jack Stone wrote: > +++ b/drivers/isdn/hardware/eicon/mntfunc.c > @@ -88,7 +88,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void) > req.didd_notify.e.Req = 0; -> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; +> req.didd_notify.e.Rc = +> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY; > - req.didd_notify.info.callback = (void *)didd_callback; > + req.didd_notify.info.callback = didd_callback; > req.didd_notify.info.context = NULL; @@ -216,9 +228,11 @@ Jack Stone wrote: > int do_wakeup = 0; > > if (e->e.complete != 0x02) { -> - diva_um_idi_ind_hdr_t *pind > - (diva_um_idi_ind_hdr_t *) +> - diva_um_idi_ind_hdr_t *pind = +> - (diva_um_idi_ind_hdr_t *) > - diva_data_q_get_segment4write(&e->data); -> + diva_um_idi_ind_hdr_t *pind > diva_data_q_get_segment4write(&e->data); +> + diva_um_idi_ind_hdr_t *pind = +> diva_data_q_get_segment4write(&e->data); > if (pind) { > e->e.RNum = 1; > e->e.R->P = (byte *) & pind[1]; @@ -227,7 +241,8 @@ Jack Stone wrote: > { > diva_um_idi_ind_hdr_t *prc; > -> - if (!(prc > - (diva_um_idi_ind_hdr_t *) diva_data_q_get_segment4write(&e->rc))) +> - if (!(prc = +> - (diva_um_idi_ind_hdr_t *) diva_data_q_get_segment4write(&e->rc))) > + if (!(prc = diva_data_q_get_segment4write(&e->rc))) > { > DBG_ERR(("A: A(%d) E(%08x) rc(%02x) lost", diff --git a/a/content_digest b/N1/content_digest index 567f042..51e5a60 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,7 +12,7 @@ "ref\049DCAC3D.5000600@fastmail.fm\0" "From\0Jack Stone <jwjstone@fastmail.fm>\0" "Subject\0Re: [PATCH 18/56] isdn: Remove void casts\0" - "Date\0Thu, 09 Apr 2009 09:58:35 +0000\0" + "Date\0Thu, 09 Apr 2009 10:58:35 +0100\0" "To\0Bert Wesarg <bert.wesarg@googlemail.com>\0" "Cc\0linux-kernel@vger.kernel.org" jeff@garzik.org @@ -57,7 +57,8 @@ "> +++ b/drivers/isdn/hardware/eicon/capifunc.c\n" "> @@ -1072,7 +1072,7 @@ static int divacapi_connect_didd(void)\n" "> req.didd_notify.e.Req = 0;\n" - "> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" + "> req.didd_notify.e.Rc =\n" + "> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" "> - req.didd_notify.info.callback = (void *)didd_callback;\n" "> + req.didd_notify.info.callback = didd_callback;\n" "> req.didd_notify.info.context = NULL;\n" @@ -70,7 +71,8 @@ "> +++ b/drivers/isdn/hardware/eicon/diddfunc.c\n" "> @@ -63,7 +63,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void)\n" "> req.didd_notify.e.Req = 0;\n" - "> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" + "> req.didd_notify.e.Rc =\n" + "> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" "> - req.didd_notify.info.callback = (void *)didd_callback;\n" "> + req.didd_notify.info.callback = didd_callback;\n" "> req.didd_notify.info.context = NULL;\n" @@ -83,7 +85,8 @@ "> +++ b/drivers/isdn/hardware/eicon/divasfunc.c\n" "> @@ -170,7 +170,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void)\n" "> req.didd_notify.e.Req = 0;\n" - "> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" + "> req.didd_notify.e.Rc =\n" + "> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" "> - req.didd_notify.info.callback = (void *)didd_callback;\n" "> + req.didd_notify.info.callback = didd_callback;\n" "> req.didd_notify.info.context = NULL;\n" @@ -100,7 +103,8 @@ "> }\n" "> \n" "> - if (!\n" - "> - (p_os > - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->\n" + "> - (p_os =\n" + "> - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->\n" "> - private_data)))\n" "> - {\n" "> + if (!(p_os = diva_um_id_get_os_context(file-> private_data))) {\n" @@ -125,7 +129,8 @@ "> return (-ENODEV);\n" "> }\n" "> \n" - "> - if (!(p_os > - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->\n" + "> - if (!(p_os =\n" + "> - (diva_um_idi_os_context_t *) diva_um_id_get_os_context(file->\n" "> - private_data)))\n" "> - {\n" "> + if (!(p_os = diva_um_id_get_os_context(file->private_data))) {\n" @@ -140,7 +145,8 @@ "> return (POLLERR);\n" "> }\n" "> \n" - "> - if ((!(p_os > - (diva_um_idi_os_context_t *)\n" + "> - if ((!(p_os =\n" + "> - (diva_um_idi_os_context_t *)\n" "> - diva_um_id_get_os_context(file->private_data)))\n" "> + if ((!(p_os = diva_um_id_get_os_context(file->private_data)))\n" "> || p_os->aborted) {\n" @@ -151,7 +157,8 @@ "> goto out;\n" "> }\n" "> \n" - "> - if (!(p_os > - (diva_um_idi_os_context_t *)\n" + "> - if (!(p_os =\n" + "> - (diva_um_idi_os_context_t *)\n" "> diva_um_id_get_os_context(file->private_data))) {\n" "> + if (!(p_os = diva_um_id_get_os_context(file->private_data))) {\n" "> ret = -ENODEV;\n" @@ -161,7 +168,8 @@ "> return (0);\n" "> }\n" "> \n" - "> - if (!(p_os > - (diva_um_idi_os_context_t *)\n" + "> - if (!(p_os =\n" + "> - (diva_um_idi_os_context_t *)\n" "> - diva_um_id_get_os_context(entity))) {\n" "> + if (!(p_os = diva_um_id_get_os_context(entity))) {\n" "> DBG_FTL((\"Zero entity os context on remove\"))\n" @@ -171,7 +179,8 @@ "> diva_um_idi_os_context_t *p_os;\n" "> \n" "> if (entity &&\n" - "> - ((p_os > - (diva_um_idi_os_context_t *)\n" + "> - ((p_os =\n" + "> - (diva_um_idi_os_context_t *)\n" "> - diva_um_id_get_os_context(entity)))) {\n" "> + ((p_os = diva_um_id_get_os_context(entity)))) {\n" "> mod_timer(&p_os->diva_timer_id, jiffies + 10 * HZ);\n" @@ -181,7 +190,8 @@ "> diva_um_idi_os_context_t *p_os;\n" "> \n" "> if (entity &&\n" - "> - ((p_os > - (diva_um_idi_os_context_t *)\n" + "> - ((p_os =\n" + "> - (diva_um_idi_os_context_t *)\n" "> - diva_um_id_get_os_context(entity)))) {\n" "> + ((p_os = diva_um_id_get_os_context(entity)))) {\n" "> del_timer(&p_os->diva_timer_id);\n" @@ -194,7 +204,8 @@ "> +++ b/drivers/isdn/hardware/eicon/idifunc.c\n" "> @@ -197,7 +197,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void)\n" "> req.didd_notify.e.Req = 0;\n" - "> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" + "> req.didd_notify.e.Rc =\n" + "> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" "> - req.didd_notify.info.callback = (void *)didd_callback;\n" "> + req.didd_notify.info.callback = didd_callback;\n" "> req.didd_notify.info.context = NULL;\n" @@ -207,7 +218,8 @@ "> +++ b/drivers/isdn/hardware/eicon/mntfunc.c\n" "> @@ -88,7 +88,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void)\n" "> req.didd_notify.e.Req = 0;\n" - "> req.didd_notify.e.Rc > IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" + "> req.didd_notify.e.Rc =\n" + "> IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;\n" "> - req.didd_notify.info.callback = (void *)didd_callback;\n" "> + req.didd_notify.info.callback = didd_callback;\n" "> req.didd_notify.info.context = NULL;\n" @@ -238,9 +250,11 @@ "> int do_wakeup = 0;\n" "> \n" "> if (e->e.complete != 0x02) {\n" - "> - diva_um_idi_ind_hdr_t *pind > - (diva_um_idi_ind_hdr_t *)\n" + "> - diva_um_idi_ind_hdr_t *pind =\n" + "> - (diva_um_idi_ind_hdr_t *)\n" "> - diva_data_q_get_segment4write(&e->data);\n" - "> + diva_um_idi_ind_hdr_t *pind > diva_data_q_get_segment4write(&e->data);\n" + "> + diva_um_idi_ind_hdr_t *pind =\n" + "> diva_data_q_get_segment4write(&e->data);\n" "> if (pind) {\n" "> e->e.RNum = 1;\n" "> e->e.R->P = (byte *) & pind[1];\n" @@ -249,7 +263,8 @@ "> {\n" "> diva_um_idi_ind_hdr_t *prc;\n" "> \n" - "> - if (!(prc > - (diva_um_idi_ind_hdr_t *) diva_data_q_get_segment4write(&e->rc)))\n" + "> - if (!(prc =\n" + "> - (diva_um_idi_ind_hdr_t *) diva_data_q_get_segment4write(&e->rc)))\n" "> + if (!(prc = diva_data_q_get_segment4write(&e->rc)))\n" "> {\n" "> DBG_ERR((\"A: A(%d) E(%08x) rc(%02x) lost\",\n" @@ -260,4 +275,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -f7214dac98a6d67cfb58576477f5a8a44e039a90c0af8de17835da1eea74b8ec +16bea5a0093d1835bfcd6b1fddca6dd8d62abe0f8ef9df826a1da989bf8b0738
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.