ide-disk: add proc_idedisk_read_smart() helper (799ee57a) · Commits · 戴 / test

drivers/ide/ide-disk.c

+17 −22

Original line number	Diff line number	Diff line
		@@ -540,13 +540,13 @@ static int proc_idedisk_read_capacity
		PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
		}

		static int proc_idedisk_read_smart_thresholds
		(char page, char start, off_t off, int count, int eof, void *data)
		static int proc_idedisk_read_smart(char page, char *start, off_t off,
		int count, int eof, void data, u8 sub_cmd)
		{
		ide_drive_t drive = (ide_drive_t )data;
		int len = 0, i = 0;

		if (get_smart_data(drive, page, SMART_READ_THRESHOLDS) == 0) {
		if (get_smart_data(drive, page, sub_cmd) == 0) {
		unsigned short val = (unsigned short ) page;
		char out = ((char )val) + (SECTOR_WORDS * 4);
		page = out;
		@@ -559,31 +559,26 @@ static int proc_idedisk_read_smart_thresholds
		PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
		}

		static int proc_idedisk_read_smart_values
		static int proc_idedisk_read_sv
		(char page, char start, off_t off, int count, int eof, void *data)
		{
		ide_drive_t drive = (ide_drive_t )data;
		int len = 0, i = 0;

		if (get_smart_data(drive, page, SMART_READ_VALUES) == 0) {
		unsigned short val = (unsigned short ) page;
		char out = ((char )val) + (SECTOR_WORDS * 4);
		page = out;
		do {
		out += sprintf(out, "%04x%c", le16_to_cpu(*val), (++i & 7) ? ' ' : '\n');
		val += 1;
		} while (i < (SECTOR_WORDS * 2));
		len = out - page;
		return proc_idedisk_read_smart(page, start, off, count, eof, data,
		SMART_READ_VALUES);
		}
		PROC_IDE_READ_RETURN(page,start,off,count,eof,len);

		static int proc_idedisk_read_st
		(char page, char start, off_t off, int count, int eof, void *data)
		{
		return proc_idedisk_read_smart(page, start, off, count, eof, data,
		SMART_READ_THRESHOLDS);
		}

		static ide_proc_entry_t idedisk_proc[] = {
		{ "cache", S_IFREG\|S_IRUGO, proc_idedisk_read_cache, NULL },
		{ "capacity", S_IFREG\|S_IRUGO, proc_idedisk_read_capacity, NULL },
		{ "geometry", S_IFREG\|S_IRUGO, proc_ide_read_geometry, NULL },
		{ "smart_values", S_IFREG\|S_IRUSR, proc_idedisk_read_smart_values, NULL },
		{ "smart_thresholds", S_IFREG\|S_IRUSR, proc_idedisk_read_smart_thresholds, NULL },
		{ "smart_values", S_IFREG\|S_IRUSR, proc_idedisk_read_sv, NULL },
		{ "smart_thresholds", S_IFREG\|S_IRUSR, proc_idedisk_read_st, NULL },
		{ NULL, 0, NULL, NULL }
		};
		#endif /* CONFIG_IDE_PROC_FS */

Admin message