All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 5/5] emoved redundant code.
@ 2017-02-28 18:28 Tamara Diaconita
  2017-02-28 18:39 ` [Outreachy kernel] " Julia Lawall
  0 siblings, 1 reply; 2+ messages in thread
From: Tamara Diaconita @ 2017-02-28 18:28 UTC (permalink / raw)
  To: mchehab, gregkh, outreachy-kernel; +Cc: Tamara Diaconita

Signed-off-by: Tamara Diaconita <diaconita.tamara@gmail.com>
---
 drivers/staging/media/cxd2099/cxd2099.c | 67 +--------------------------------
 1 file changed, 1 insertion(+), 66 deletions(-)

diff --git a/drivers/staging/media/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c
index 43b0507..0d25849 100644
--- a/drivers/staging/media/cxd2099/cxd2099.c
+++ b/drivers/staging/media/cxd2099/cxd2099.c
@@ -180,33 +180,6 @@ static int write_io(struct cxd *ci, u16 address, u8 val)
 	return status;
 }
 
-#if 0
-static int read_io_data(struct cxd *ci, u8 *data, u8 n)
-{
-	int status;
-	u8 addr[3] = { 2, 0, 0 };
-
-	status = i2c_write(ci->i2c, ci->cfg.adr, addr, 3);
-	if (!status)
-		status = i2c_read(ci->i2c, ci->cfg.adr, 3, data, n);
-	return 0;
-}
-
-static int write_io_data(struct cxd *ci, u8 *data, u8 n)
-{
-	int status;
-	u8 addr[3] = {2, 0, 0};
-
-	status = i2c_write(ci->i2c, ci->cfg.adr, addr, 3);
-	if (!status) {
-		u8 buf[256] = {3};
-
-		memcpy(buf + 1, data, n);
-		status = i2c_write(ci->i2c, ci->cfg.adr, buf, n + 1);
-	}
-	return 0;
-}
-#endif
 
 static int write_regm(struct cxd *ci, u8 reg, u8 val, u8 mask)
 {
@@ -326,12 +299,7 @@ static int init(struct cxd *ci)
 		if (status < 0)
 			break;
 
-#if 0
 		/* Input Mode C, BYPass Serial, TIVAL = low, MSB */
-		status = write_reg(ci, 0x09, 0x4D);
-		if (status < 0)
-			break;
-#endif
 		/* TOSTRT = 8, Mode B (gated clock), falling Edge,
 		 * Serial, POL=HIGH, MSB
 		 */
@@ -429,23 +397,7 @@ static int read_attribute_mem(struct dvb_ca_en50221 *ca,
 			      int slot, int address)
 {
 	struct cxd *ci = ca->data;
-#if 0
-	if (ci->amem_read) {
-		if (address <= 0 || address > 1024)
-			return -EIO;
-		return ci->amem[address];
-	}
 
-	mutex_lock(&ci->lock);
-	write_regm(ci, 0x06, 0x00, 0x05);
-	read_pccard(ci, 0, &ci->amem[0], 128);
-	read_pccard(ci, 128, &ci->amem[0], 128);
-	read_pccard(ci, 256, &ci->amem[0], 128);
-	read_pccard(ci, 384, &ci->amem[0], 128);
-	write_regm(ci, 0x06, 0x05, 0x05);
-	mutex_unlock(&ci->lock);
-	return ci->amem[address];
-#else
 	u8 val;
 
 	mutex_lock(&ci->lock);
@@ -499,15 +451,6 @@ static int slot_reset(struct dvb_ca_en50221 *ca, int slot)
 	struct cxd *ci = ca->data;
 
 	mutex_lock(&ci->lock);
-#if 0
-	write_reg(ci, 0x00, 0x21);
-	write_reg(ci, 0x06, 0x1F);
-	write_reg(ci, 0x00, 0x31);
-#else
-#if 0
-	write_reg(ci, 0x06, 0x1F);
-	write_reg(ci, 0x06, 0x2F);
-#else
 	cam_mode(ci, 0);
 	write_reg(ci, 0x00, 0x21);
 	write_reg(ci, 0x06, 0x1F);
@@ -520,17 +463,9 @@ static int slot_reset(struct dvb_ca_en50221 *ca, int slot)
 	ci->mode = -1;
 	{
 		int i;
-#if 0
-		u8 val;
-#endif
+
 		for (i = 0; i < 100; i++) {
 			usleep_range(10000, 11000);
-#if 0
-			read_reg(ci, 0x06, &val);
-			dev_info(&ci->i2c->dev, "%d:%02x\n", i, val);
-			if (!(val & 0x10))
-				break;
-#else
 			if (ci->ready)
 				break;
 #endif
-- 
2.9.3



^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Outreachy kernel] [PATCH 5/5] emoved redundant code.
  2017-02-28 18:28 [PATCH 5/5] emoved redundant code Tamara Diaconita
@ 2017-02-28 18:39 ` Julia Lawall
  0 siblings, 0 replies; 2+ messages in thread
From: Julia Lawall @ 2017-02-28 18:39 UTC (permalink / raw)
  To: Tamara Diaconita; +Cc: mchehab, gregkh, outreachy-kernel, Tamara Diaconita

In addition to what the patch-bot said, you should used the imperative
(remove) rather than the past tense (removed).

julia

On Tue, 28 Feb 2017, Tamara Diaconita wrote:

> Signed-off-by: Tamara Diaconita <diaconita.tamara@gmail.com>
> ---
>  drivers/staging/media/cxd2099/cxd2099.c | 67 +--------------------------------
>  1 file changed, 1 insertion(+), 66 deletions(-)
>
> diff --git a/drivers/staging/media/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c
> index 43b0507..0d25849 100644
> --- a/drivers/staging/media/cxd2099/cxd2099.c
> +++ b/drivers/staging/media/cxd2099/cxd2099.c
> @@ -180,33 +180,6 @@ static int write_io(struct cxd *ci, u16 address, u8 val)
>  	return status;
>  }
>
> -#if 0
> -static int read_io_data(struct cxd *ci, u8 *data, u8 n)
> -{
> -	int status;
> -	u8 addr[3] = { 2, 0, 0 };
> -
> -	status = i2c_write(ci->i2c, ci->cfg.adr, addr, 3);
> -	if (!status)
> -		status = i2c_read(ci->i2c, ci->cfg.adr, 3, data, n);
> -	return 0;
> -}
> -
> -static int write_io_data(struct cxd *ci, u8 *data, u8 n)
> -{
> -	int status;
> -	u8 addr[3] = {2, 0, 0};
> -
> -	status = i2c_write(ci->i2c, ci->cfg.adr, addr, 3);
> -	if (!status) {
> -		u8 buf[256] = {3};
> -
> -		memcpy(buf + 1, data, n);
> -		status = i2c_write(ci->i2c, ci->cfg.adr, buf, n + 1);
> -	}
> -	return 0;
> -}
> -#endif
>
>  static int write_regm(struct cxd *ci, u8 reg, u8 val, u8 mask)
>  {
> @@ -326,12 +299,7 @@ static int init(struct cxd *ci)
>  		if (status < 0)
>  			break;
>
> -#if 0
>  		/* Input Mode C, BYPass Serial, TIVAL = low, MSB */
> -		status = write_reg(ci, 0x09, 0x4D);
> -		if (status < 0)
> -			break;
> -#endif
>  		/* TOSTRT = 8, Mode B (gated clock), falling Edge,
>  		 * Serial, POL=HIGH, MSB
>  		 */
> @@ -429,23 +397,7 @@ static int read_attribute_mem(struct dvb_ca_en50221 *ca,
>  			      int slot, int address)
>  {
>  	struct cxd *ci = ca->data;
> -#if 0
> -	if (ci->amem_read) {
> -		if (address <= 0 || address > 1024)
> -			return -EIO;
> -		return ci->amem[address];
> -	}
>
> -	mutex_lock(&ci->lock);
> -	write_regm(ci, 0x06, 0x00, 0x05);
> -	read_pccard(ci, 0, &ci->amem[0], 128);
> -	read_pccard(ci, 128, &ci->amem[0], 128);
> -	read_pccard(ci, 256, &ci->amem[0], 128);
> -	read_pccard(ci, 384, &ci->amem[0], 128);
> -	write_regm(ci, 0x06, 0x05, 0x05);
> -	mutex_unlock(&ci->lock);
> -	return ci->amem[address];
> -#else
>  	u8 val;
>
>  	mutex_lock(&ci->lock);
> @@ -499,15 +451,6 @@ static int slot_reset(struct dvb_ca_en50221 *ca, int slot)
>  	struct cxd *ci = ca->data;
>
>  	mutex_lock(&ci->lock);
> -#if 0
> -	write_reg(ci, 0x00, 0x21);
> -	write_reg(ci, 0x06, 0x1F);
> -	write_reg(ci, 0x00, 0x31);
> -#else
> -#if 0
> -	write_reg(ci, 0x06, 0x1F);
> -	write_reg(ci, 0x06, 0x2F);
> -#else
>  	cam_mode(ci, 0);
>  	write_reg(ci, 0x00, 0x21);
>  	write_reg(ci, 0x06, 0x1F);
> @@ -520,17 +463,9 @@ static int slot_reset(struct dvb_ca_en50221 *ca, int slot)
>  	ci->mode = -1;
>  	{
>  		int i;
> -#if 0
> -		u8 val;
> -#endif
> +
>  		for (i = 0; i < 100; i++) {
>  			usleep_range(10000, 11000);
> -#if 0
> -			read_reg(ci, 0x06, &val);
> -			dev_info(&ci->i2c->dev, "%d:%02x\n", i, val);
> -			if (!(val & 0x10))
> -				break;
> -#else
>  			if (ci->ready)
>  				break;
>  #endif
> --
> 2.9.3
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170228182809.26734-1-diaconita.tamara%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-28 18:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-28 18:28 [PATCH 5/5] emoved redundant code Tamara Diaconita
2017-02-28 18:39 ` [Outreachy kernel] " Julia Lawall

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.