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

Commit e6298c6d authored by Len Brown's avatar Len Brown
Browse files

DMI: remove duplicate helper routine 



Use existing dmi_get_system_info(),
Delete duplicate dmi_get_slot()

Spotted-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8964ebb8

drivers/acpi/osl.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1220,17 +1220,17 @@ int acpi_dmi_dump(void) 
		return -1;

		return -1;





	printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n",

	printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n",

		dmi_get_slot(DMI_SYS_VENDOR));

		dmi_get_system_info(DMI_SYS_VENDOR));

	printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n",

	printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n",

		dmi_get_slot(DMI_PRODUCT_NAME));

		dmi_get_system_info(DMI_PRODUCT_NAME));

	printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n",

	printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n",

		dmi_get_slot(DMI_PRODUCT_VERSION));

		dmi_get_system_info(DMI_PRODUCT_VERSION));

	printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n",

	printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n",

		dmi_get_slot(DMI_BOARD_NAME));

		dmi_get_system_info(DMI_BOARD_NAME));

	printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n",

	printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n",

		dmi_get_slot(DMI_BIOS_VENDOR));

		dmi_get_system_info(DMI_BIOS_VENDOR));

	printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n",

	printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n",

		dmi_get_slot(DMI_BIOS_DATE));

		dmi_get_system_info(DMI_BIOS_DATE));





	return 0;

	return 0;

}

}

drivers/firmware/dmi_scan.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -489,12 +489,3 @@ int dmi_get_year(int field) 




	return year;

	return year;

}
 
}
 


/**

 *	dmi_get_slot - return dmi_ident[slot]

 *	@slot:	index into dmi_ident[]

 */

char *dmi_get_slot(int slot)

{

	return(dmi_ident[slot]);

}

include/linux/dmi.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -79,7 +79,6 @@ extern void dmi_scan_machine(void); 
extern int dmi_get_year(int field);

extern int dmi_get_year(int field);

extern int dmi_name_in_vendors(const char *str);

extern int dmi_name_in_vendors(const char *str);

extern int dmi_available;

extern int dmi_available;

extern char *dmi_get_slot(int slot);





#else

#else
@@ -90,7 +89,6 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na 
static inline int dmi_get_year(int year) { return 0; }

static inline int dmi_get_year(int year) { return 0; }

static inline int dmi_name_in_vendors(const char *s) { return 0; }

static inline int dmi_name_in_vendors(const char *s) { return 0; }

#define dmi_available 0

#define dmi_available 0

static inline char *dmi_get_slot(int slot) { return NULL; }





#endif

#endif