Commit 79ba6757 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: use dev_printk for cs_error() 



Use dev_printk() in cs_error()-based error reporting. While this
function-turned-macro will hopefully go away soon, using dev_printk
simplifies the code much.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 9c8b7965

drivers/pcmcia/ds.c

+18 −32
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ spinlock_t pcmcia_dev_list_lock; 
/* String tables for error messages */



typedef struct lookup_t {

    int key;

    char *msg;

    const int key;

    const char *msg;

} lookup_t;



static const lookup_t error_table[] = {
@@ -137,46 +137,32 @@ static const lookup_t service_table[] = { 
    { ReplaceCIS,			"ReplaceCIS" }

};





static int pcmcia_report_error(struct pcmcia_device *p_dev, error_info_t *err)

const char *pcmcia_error_func(int func)

{

	int i;

	char *serv;



	if (!p_dev)

		printk(KERN_NOTICE);

	else

		printk(KERN_NOTICE "%s: ", p_dev->dev.bus_id);



	for (i = 0; i < ARRAY_SIZE(service_table); i++)

		if (service_table[i].key == err->func)

			break;

	if (i < ARRAY_SIZE(service_table))

		serv = service_table[i].msg;

	else

		serv = "Unknown service number";

		if (service_table[i].key == func)

			return service_table[i].msg;



	for (i = 0; i < ARRAY_SIZE(error_table); i++)

		if (error_table[i].key == err->retcode)

			break;

	if (i < ARRAY_SIZE(error_table))

		printk("%s: %s\n", serv, error_table[i].msg);

	else

		printk("%s: Unknown error code %#x\n", serv, err->retcode);

	return "Unknown service number";

}

EXPORT_SYMBOL(pcmcia_error_func);



	return 0;

} /* report_error */

const char *pcmcia_error_ret(int ret)

{

	int i;



/* end of code which was in cs.c before */

	for (i = 0; i < ARRAY_SIZE(error_table); i++)

		if (error_table[i].key == ret)

			return error_table[i].msg;



	return "unknown";

}

EXPORT_SYMBOL(pcmcia_error_ret);



/*======================================================================*/



void cs_error(struct pcmcia_device *p_dev, int func, int ret)

{

	error_info_t err = { func, ret };

	pcmcia_report_error(p_dev, &err);

}

EXPORT_SYMBOL(cs_error);





static void pcmcia_check_driver(struct pcmcia_driver *p_drv)

include/pcmcia/ds.h

+12 −1
Original line number Diff line number Diff line
@@ -249,7 +249,18 @@ struct pcmcia_device { 
#define handle_to_dev(handle) (handle->dev)



/* error reporting */

void cs_error(struct pcmcia_device *handle, int func, int ret);



const char *pcmcia_error_func(int func);

const char *pcmcia_error_ret(int ret);



#define cs_error(p_dev, func, ret)			\

	{						\

		dev_printk(KERN_NOTICE, &p_dev->dev,	\

			   "%s : %s\n",			\

			   pcmcia_error_func(func),	\

			   pcmcia_error_ret(ret));	\

	}





#endif /* __KERNEL__ */

#endif /* _LINUX_DS_H */