Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ddeb09d authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: ds1685: drop RTC_DS1685_PROC_REGS 



/proc is not the correct ABI to display debugging info. Remove
RTC_DS1685_PROC_REGS as the driver hasn't seen any real development since
it was included.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent c7080e20

drivers/rtc/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -1008,17 +1008,6 @@ config RTC_DRV_DS17885 


endchoice



config RTC_DS1685_PROC_REGS

	bool "Display register values in /proc"

	depends on RTC_DRV_DS1685_FAMILY && PROC_FS

	help

	  Enable this to display a readout of all of the RTC registers in

	  /proc/drivers/rtc.  Keep in mind that this can potentially lead

	  to lost interrupts, as reading Control Register C will clear

	  all pending IRQ flags.



	  Unless you are debugging this driver, choose N.



config RTC_DRV_DS1742

	tristate "Maxim/Dallas DS1742/1743"

	depends on HAS_IOMEM

drivers/rtc/rtc-ds1685.c

+0 −61
Original line number Diff line number Diff line
@@ -770,33 +770,6 @@ static const char *ds1685_rtc_sqw_freq[16] = { 
	"512Hz", "256Hz", "128Hz", "64Hz", "32Hz", "16Hz", "8Hz", "4Hz", "2Hz"

};



#ifdef CONFIG_RTC_DS1685_PROC_REGS

/**

 * ds1685_rtc_print_regs - helper function to print register values.

 * @hex: hex byte to convert into binary bits.

 * @dest: destination char array.

 *

 * This is basically a hex->binary function, just with extra spacing between

 * the digits.  It only works on 1-byte values (8 bits).

 */

static char*

ds1685_rtc_print_regs(u8 hex, char *dest)

{

	u32 i, j;

	char *tmp = dest;



	for (i = 0; i < NUM_BITS; i++) {

		*tmp++ = ((hex & 0x80) != 0 ? '1' : '0');

		for (j = 0; j < NUM_SPACES; j++)

			*tmp++ = ' ';

		hex <<= 1;

	}

	*tmp++ = '\0';



	return dest;

}

#endif



/**

 * ds1685_rtc_proc - procfs access function.

 * @dev: pointer to device structure.
@@ -809,9 +782,6 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) 
	struct ds1685_priv *rtc = platform_get_drvdata(pdev);

	u8 ctrla, ctrlb, ctrlc, ctrld, ctrl4a, ctrl4b, ssn[8];

	char *model;

#ifdef CONFIG_RTC_DS1685_PROC_REGS

	char bits[NUM_REGS][(NUM_BITS * NUM_SPACES) + NUM_BITS + 1];

#endif



	/* Read all the relevant data from the control registers. */

	ds1685_rtc_switch_to_bank1(rtc);
@@ -859,28 +829,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) 
	   "Periodic IRQ\t: %s\n"

	   "Periodic Rate\t: %s\n"

	   "SQW Freq\t: %s\n"

#ifdef CONFIG_RTC_DS1685_PROC_REGS

	   "Serial #\t: %8phC\n"

	   "Register Status\t:\n"

	   "   Ctrl A\t: UIP  DV2  DV1  DV0  RS3  RS2  RS1  RS0\n"

	   "\t\t:  %s\n"

	   "   Ctrl B\t: SET  PIE  AIE  UIE  SQWE  DM  2412 DSE\n"

	   "\t\t:  %s\n"

	   "   Ctrl C\t: IRQF  PF   AF   UF  ---  ---  ---  ---\n"

	   "\t\t:  %s\n"

	   "   Ctrl D\t: VRT  ---  ---  ---  ---  ---  ---  ---\n"

	   "\t\t:  %s\n"

#if !defined(CONFIG_RTC_DRV_DS1685) && !defined(CONFIG_RTC_DRV_DS1689)

	   "   Ctrl 4A\t: VRT2 INCR BME  ---  PAB   RF   WF   KF\n"

#else

	   "   Ctrl 4A\t: VRT2 INCR ---  ---  PAB   RF   WF   KF\n"

#endif

	   "\t\t:  %s\n"

	   "   Ctrl 4B\t: ABE  E32k  CS  RCE  PRS  RIE  WIE  KSE\n"

	   "\t\t:  %s\n",

#else

	   "Serial #\t: %8phC\n",

#endif

	   model,

	   ((ctrla & RTC_CTRL_A_DV1) ? "enabled" : "disabled"),

	   ((ctrlb & RTC_CTRL_B_2412) ? "24-hour" : "12-hour"),
@@ -894,17 +843,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) 
	    ds1685_rtc_pirq_rate[(ctrla & RTC_CTRL_A_RS_MASK)] : "none"),

	   (!((ctrl4b & RTC_CTRL_4B_E32K)) ?

	    ds1685_rtc_sqw_freq[(ctrla & RTC_CTRL_A_RS_MASK)] : "32768Hz"),

#ifdef CONFIG_RTC_DS1685_PROC_REGS

	   ssn,

	   ds1685_rtc_print_regs(ctrla, bits[0]),

	   ds1685_rtc_print_regs(ctrlb, bits[1]),

	   ds1685_rtc_print_regs(ctrlc, bits[2]),

	   ds1685_rtc_print_regs(ctrld, bits[3]),

	   ds1685_rtc_print_regs(ctrl4a, bits[4]),

	   ds1685_rtc_print_regs(ctrl4b, bits[5]));

#else

	   ssn);

#endif

	return 0;

}

#else