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

Commit 4b65fc8c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

firmware: clean up samples for coding style issues 



This fixes up a number of coding style issues in the firmware sample files.

Yeah, it still doesn't build properly yet, that's next...


Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d289bf7b

samples/firmware_class/firmware_sample_driver.c

+25 −20
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
#include <linux/init.h>

#include <linux/device.h>

#include <linux/string.h>



#include "linux/firmware.h"

#include <linux/firmware.h>



static struct device ghost_device = {

	.bus_id    = "ghost0",
@@ -32,10 +31,13 @@ static void sample_probe_default(void) 
{

	/* uses the default method to get the firmware */

	const struct firmware *fw_entry;

	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");

	int retval;



        if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)

	{

	printk(KERN_INFO "firmware_sample_driver: "

		"a ghost device got inserted :)\n");



	retval = request_firmware(&fw_entry, "sample_driver_fw", &ghost_device);

	if (retval) {

		printk(KERN_ERR

		       "firmware_sample_driver: Firmware not available\n");

		return;
@@ -47,17 +49,20 @@ static void sample_probe_default(void) 


	/* finish setting up the device */

}



static void sample_probe_specific(void)

{

	int retval;

	/* Uses some specific hotplug support to get the firmware from

	 * userspace  directly into the hardware, or via some sysfs file */



	/* NOTE: This currently doesn't work */



	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");

	printk(KERN_INFO "firmware_sample_driver: "

		"a ghost device got inserted :)\n");



        if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)

	{

	retval = request_firmware(NULL, "sample_driver_fw", &ghost_device);

	if (retval) {

		printk(KERN_ERR

		       "firmware_sample_driver: Firmware load failed\n");

		return;
@@ -80,6 +85,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context) 
	       (char *)context);

	sample_firmware_load(fw->data, fw->size);

}



static void sample_probe_async(void)

{

	/* Let's say that I can't sleep */
@@ -88,12 +94,10 @@ static void sample_probe_async(void) 
					"sample_driver_fw", &ghost_device,

					"my device pointer",

					sample_probe_async_cont);

	if(error){

		printk(KERN_ERR

		       "firmware_sample_driver:"

	if (error)

		printk(KERN_ERR "firmware_sample_driver:"

		       " request_firmware_nowait failed\n");

}

}



static int sample_init(void)

{
@@ -105,6 +109,7 @@ static int sample_init(void) 
	sample_probe_async();

	return 0;

}



static void __exit sample_exit(void)

{

}

samples/firmware_class/firmware_sample_firmware_class.c

+15 −18
Original line number Diff line number Diff line
@@ -27,28 +27,25 @@ static inline struct class_device *to_class_dev(struct kobject *obj) 
{

	return container_of(obj, struct class_device, kobj);

}



static inline

struct class_device_attribute *to_class_dev_attr(struct attribute *_attr)

{

	return container_of(_attr, struct class_device_attribute, attr);

}



int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr);

int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);



struct firmware_priv {

	char fw_id[FIRMWARE_NAME_MAX];

	s32 loading:2;

	u32 abort:1;

};



extern struct class firmware_class;



static ssize_t firmware_loading_show(struct class_device *class_dev, char *buf)

{

	struct firmware_priv *fw_priv = class_get_devdata(class_dev);

	return sprintf(buf, "%d\n", fw_priv->loading);

}



static ssize_t firmware_loading_store(struct class_device *class_dev,

				      const char *buf, size_t count)

{
@@ -132,14 +129,14 @@ static int fw_setup_class_device(struct class_device *class_dev, 
	retval = class_device_register(class_dev);

	if (retval) {

		printk(KERN_ERR "%s: class_device_register failed\n",

		       __FUNCTION__);

		       __func__);

		goto error_free_fw_priv;

	}



	retval = sysfs_create_bin_file(&class_dev->kobj, &firmware_attr_data);

	if (retval) {

		printk(KERN_ERR "%s: sysfs_create_bin_file failed\n",

		       __FUNCTION__);

		       __func__);

		goto error_unreg_class_dev;

	}
@@ -147,7 +144,7 @@ static int fw_setup_class_device(struct class_device *class_dev, 
					  &class_device_attr_loading);

	if (retval) {

		printk(KERN_ERR "%s: class_device_create_file failed\n",

		       __FUNCTION__);

		       __func__);

		goto error_remove_data;

	}