Commit c059d579 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

parport: daisy: avoid hardcoded name 



The daisy device name is hardcoded, define it in the header file and
use it in the code.

Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lore.kernel.org/r/20191016144540.18810-1-sudipm.mukherjee@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 45a2d646

drivers/parport/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer, 
ssize_t parport_device_id (int devnum, char *buffer, size_t count)

{

	ssize_t retval = -ENXIO;

	struct pardevice *dev = parport_open (devnum, "Device ID probe");

	struct pardevice *dev = parport_open(devnum, daisy_dev_name);

	if (!dev)

		return -ENXIO;

include/linux/parport.h

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ extern size_t parport_ieee1284_epp_read_addr (struct parport *, 
					      void *, size_t, int);



/* IEEE1284.3 functions */

#define daisy_dev_name "Device ID probe"

extern int parport_daisy_init (struct parport *port);

extern void parport_daisy_fini (struct parport *port);

extern struct pardevice *parport_open (int devnum, const char *name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE