diff for duplicates of <49DCAC3D.5000600@fastmail.fm> diff --git a/a/1.txt b/N1/1.txt index 23767da..7b280d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,8 @@ index 4d425c6..7027547 100644 +++ 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; @@ -46,7 +47,8 @@ index 3029234..d97bfba 100644 +++ 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; @@ -59,7 +61,8 @@ index d36a4c0..2616a22 100644 +++ 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; @@ -76,7 +79,8 @@ size_t count, loff_t * offset) } - 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))) { @@ -101,7 +105,8 @@ int adapter_nr) 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))) { @@ -116,7 +121,8 @@ poll_table * wait) 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) { @@ -127,7 +133,8 @@ struct file *file) 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; @@ -137,7 +144,8 @@ diva_um_id_get_os_context(file->private_data))) { 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")) @@ -147,7 +155,8 @@ diva_um_id_get_os_context(file->private_data))) { 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); @@ -157,7 +166,8 @@ diva_um_id_get_os_context(file->private_data))) { 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); @@ -170,7 +180,8 @@ index db87d51..5399cc1 100644 +++ 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; @@ -183,7 +194,8 @@ index a564b75..2251662 100644 +++ 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; @@ -214,9 +226,11 @@ e, byte ind) 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]; @@ -225,7 +239,8 @@ e, byte rc) { 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 f4bd639..0a51224 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,7 +11,7 @@ "ref\036ca99e90904080437g55286754kd13b16ccc5139cb@mail.gmail.com\0" "From\0Jack Stone <jwjstone@fastmail.fm>\0" "Subject\0Re: [PATCH 18/56] isdn: Remove void casts\0" - "Date\0Wed, 08 Apr 2009 13:53:01 +0000\0" + "Date\0Wed, 08 Apr 2009 14:53:01 +0100\0" "To\0Bert Wesarg <bert.wesarg@googlemail.com>\0" "Cc\0linux-kernel@vger.kernel.org" jeff@garzik.org @@ -53,7 +53,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" @@ -66,7 +67,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" @@ -79,7 +81,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" @@ -96,7 +99,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" @@ -121,7 +125,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" @@ -136,7 +141,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" @@ -147,7 +153,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" @@ -157,7 +164,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" @@ -167,7 +175,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" @@ -177,7 +186,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" @@ -190,7 +200,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" @@ -203,7 +214,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" @@ -234,9 +246,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" @@ -245,10 +259,11 @@ " {\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" e->adapter->adapter_nr, e, rc)); -e987720714aa32900bc13dacea60ec8de5ea81ed6a92201727db6f80ed345ed6 +4780de8824bac6e4429db3c6c0e7ca3dff1b93abcceac608f162aec626530459
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.