mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux 

Pull pcmcia updates from Dominik Brodowski:
 "A number of patches fixing W=1 kernel build warnings, and one patch
  removing an always-false NULL check"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting
  pcmcia: pcmcia_resource: Fix some kernel-doc formatting/disparities and demote others
  pcmcia: ds: Fix function name disparity in header
  pcmcia: pcmcia_cis: Demote non-conforming kernel-doc headers to standard kernel-doc
  pcmcia: cistpl: Demote non-conformant kernel-doc headers to standard comments
  pcmcia: rsrc_nonstatic: Demote kernel-doc abuses
  pcmcia: ds: Remove if with always false condition
This commit is contained in:
Linus Torvalds 2021-05-06 11:08:50 -07:00
parent 7ac86b3dca e9d503fef7
commit 38182162b5
5 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/pcmcia/cistpl.c
View File

@ -75,7 +75,7 @@ void release_cis_mem(struct pcmcia_socket *s)
mutex_unlock(&s->ops_mutex); mutex_unlock(&s->ops_mutex);
} }
/** /*
* set_cis_map() - map the card memory at "card_offset" into virtual space. * set_cis_map() - map the card memory at "card_offset" into virtual space.
* *
* If flags & MAP_ATTRIB, map the attribute space, otherwise * If flags & MAP_ATTRIB, map the attribute space, otherwise
@ -126,7 +126,7 @@ static void __iomem *set_cis_map(struct pcmcia_socket *s,
#define IS_ATTR 1 #define IS_ATTR 1
#define IS_INDIRECT 8 #define IS_INDIRECT 8
/** /*
* pcmcia_read_cis_mem() - low-level function to read CIS memory * pcmcia_read_cis_mem() - low-level function to read CIS memory
* *
* must be called with ops_mutex held * must be called with ops_mutex held
@ -206,7 +206,7 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
} }
/** /*
* pcmcia_write_cis_mem() - low-level function to write CIS memory * pcmcia_write_cis_mem() - low-level function to write CIS memory
* *
* Probably only useful for writing one-byte registers. Must be called * Probably only useful for writing one-byte registers. Must be called
@ -277,7 +277,7 @@ int pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
} }
/** /*
* read_cis_cache() - read CIS memory or its associated cache * read_cis_cache() - read CIS memory or its associated cache
* *
* This is a wrapper around read_cis_mem, with the same interface, * This is a wrapper around read_cis_mem, with the same interface,
@ -365,7 +365,7 @@ void destroy_cis_cache(struct pcmcia_socket *s)
} }
} }
/** /*
* verify_cis_cache() - does the CIS match what is in the CIS cache? * verify_cis_cache() - does the CIS match what is in the CIS cache?
*/ */
int verify_cis_cache(struct pcmcia_socket *s) int verify_cis_cache(struct pcmcia_socket *s)
@ -401,7 +401,7 @@ int verify_cis_cache(struct pcmcia_socket *s)
return 0; return 0;
} }
/** /*
* pcmcia_replace_cis() - use a replacement CIS instead of the card's CIS * pcmcia_replace_cis() - use a replacement CIS instead of the card's CIS
* *
* For really bad cards, we provide a facility for uploading a * For really bad cards, we provide a facility for uploading a

7
drivers/pcmcia/ds.c
View File

@ -83,7 +83,7 @@ struct pcmcia_dynid {
}; };
/** /**
* pcmcia_store_new_id - add a new PCMCIA device ID to this driver and re-probe devices * new_id_store() - add a new PCMCIA device ID to this driver and re-probe devices
* @driver: target device driver * @driver: target device driver
* @buf: buffer for scanning device ID data * @buf: buffer for scanning device ID data
* @count: input size * @count: input size
@ -371,9 +371,6 @@ static int pcmcia_device_remove(struct device *dev)
pcmcia_card_remove(p_dev->socket, p_dev); pcmcia_card_remove(p_dev->socket, p_dev);
/* detach the "instance" */ /* detach the "instance" */
if (!p_drv)
return 0;
if (p_drv->remove) if (p_drv->remove)
p_drv->remove(p_dev); p_drv->remove(p_dev);
@ -389,7 +386,7 @@ static int pcmcia_device_remove(struct device *dev)
"pcmcia: driver %s did not release window properly\n", "pcmcia: driver %s did not release window properly\n",
p_drv->name); p_drv->name);
/* references from pcmcia_probe_device */ /* references from pcmcia_device_probe */
pcmcia_put_dev(p_dev); pcmcia_put_dev(p_dev);
module_put(p_drv->owner); module_put(p_drv->owner);

10
drivers/pcmcia/pcmcia_cis.c
View File

@ -122,7 +122,7 @@ next_entry:
} }
/** /*
* pcmcia_io_cfg_data_width() - convert cfgtable to data path width parameter * pcmcia_io_cfg_data_width() - convert cfgtable to data path width parameter
*/ */
static int pcmcia_io_cfg_data_width(unsigned int flags) static int pcmcia_io_cfg_data_width(unsigned int flags)
@ -143,7 +143,7 @@ struct pcmcia_cfg_mem {
cistpl_cftable_entry_t dflt; cistpl_cftable_entry_t dflt;
}; };
/** /*
* pcmcia_do_loop_config() - internal helper for pcmcia_loop_config() * pcmcia_do_loop_config() - internal helper for pcmcia_loop_config()
* *
* pcmcia_do_loop_config() is the internal callback for the call from * pcmcia_do_loop_config() is the internal callback for the call from
@ -289,7 +289,7 @@ struct pcmcia_loop_mem {
void *priv_data); void *priv_data);
}; };
/** /*
* pcmcia_do_loop_tuple() - internal helper for pcmcia_loop_config() * pcmcia_do_loop_tuple() - internal helper for pcmcia_loop_config()
* *
* pcmcia_do_loop_tuple() is the internal callback for the call from * pcmcia_do_loop_tuple() is the internal callback for the call from
@ -337,7 +337,7 @@ struct pcmcia_loop_get {
cisdata_t **buf; cisdata_t **buf;
}; };
/** /*
* pcmcia_do_get_tuple() - internal helper for pcmcia_get_tuple() * pcmcia_do_get_tuple() - internal helper for pcmcia_get_tuple()
* *
* pcmcia_do_get_tuple() is the internal callback for the call from * pcmcia_do_get_tuple() is the internal callback for the call from
@ -386,7 +386,7 @@ size_t pcmcia_get_tuple(struct pcmcia_device *p_dev, cisdata_t code,
EXPORT_SYMBOL(pcmcia_get_tuple); EXPORT_SYMBOL(pcmcia_get_tuple);
/** /*
* pcmcia_do_get_mac() - internal helper for pcmcia_get_mac_from_cis() * pcmcia_do_get_mac() - internal helper for pcmcia_get_mac_from_cis()
* *
* pcmcia_do_get_mac() is the internal callback for the call from * pcmcia_do_get_mac() is the internal callback for the call from

11
drivers/pcmcia/pcmcia_resource.c
View File

@ -144,7 +144,7 @@ static int alloc_io_space(struct pcmcia_socket *s, struct resource *res,
} }
/** /*
* pcmcia_access_config() - read or write card configuration registers * pcmcia_access_config() - read or write card configuration registers
* *
* pcmcia_access_config() reads and writes configuration registers in * pcmcia_access_config() reads and writes configuration registers in
@ -184,7 +184,7 @@ static int pcmcia_access_config(struct pcmcia_device *p_dev,
} }
/** /*
* pcmcia_read_config_byte() - read a byte from a card configuration register * pcmcia_read_config_byte() - read a byte from a card configuration register
* *
* pcmcia_read_config_byte() reads a byte from a configuration register in * pcmcia_read_config_byte() reads a byte from a configuration register in
@ -197,7 +197,7 @@ int pcmcia_read_config_byte(struct pcmcia_device *p_dev, off_t where, u8 *val)
EXPORT_SYMBOL(pcmcia_read_config_byte); EXPORT_SYMBOL(pcmcia_read_config_byte);
/** /*
* pcmcia_write_config_byte() - write a byte to a card configuration register * pcmcia_write_config_byte() - write a byte to a card configuration register
* *
* pcmcia_write_config_byte() writes a byte to a configuration register in * pcmcia_write_config_byte() writes a byte to a configuration register in
@ -720,7 +720,8 @@ static irqreturn_t test_action(int cpl, void *dev_id)
/** /**
* pcmcia_setup_isa_irq() - determine whether an ISA IRQ can be used * pcmcia_setup_isa_irq() - determine whether an ISA IRQ can be used
* @p_dev - the associated PCMCIA device * @p_dev: the associated PCMCIA device
* @type: IRQ type (flags)
* *
* locking note: must be called with ops_mutex locked. * locking note: must be called with ops_mutex locked.
*/ */
@ -785,7 +786,7 @@ void pcmcia_cleanup_irq(struct pcmcia_socket *s)
/** /**
* pcmcia_setup_irq() - determine IRQ to be used for device * pcmcia_setup_irq() - determine IRQ to be used for device
* @p_dev - the associated PCMCIA device * @p_dev: the associated PCMCIA device
* *
* locking note: must be called with ops_mutex locked. * locking note: must be called with ops_mutex locked.
*/ */

22
drivers/pcmcia/rsrc_nonstatic.c
View File

@ -257,7 +257,7 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base,
/*======================================================================*/ /*======================================================================*/
/** /*
* readable() - iomem validation function for cards with a valid CIS * readable() - iomem validation function for cards with a valid CIS
*/ */
static int readable(struct pcmcia_socket *s, struct resource *res, static int readable(struct pcmcia_socket *s, struct resource *res,
@ -288,7 +288,7 @@ static int readable(struct pcmcia_socket *s, struct resource *res,
return 0; return 0;
} }
/** /*
* checksum() - iomem validation function for simple memory cards * checksum() - iomem validation function for simple memory cards
*/ */
static int checksum(struct pcmcia_socket *s, struct resource *res, static int checksum(struct pcmcia_socket *s, struct resource *res,
@ -343,9 +343,9 @@ static int checksum(struct pcmcia_socket *s, struct resource *res,
*/ */
static int do_validate_mem(struct pcmcia_socket *s, static int do_validate_mem(struct pcmcia_socket *s,
unsigned long base, unsigned long size, unsigned long base, unsigned long size,
int validate (struct pcmcia_socket *s, int (*validate)(struct pcmcia_socket *s,
struct resource *res, struct resource *res,
unsigned int *value)) unsigned int *value))
{ {
struct socket_data *s_data = s->resource_data; struct socket_data *s_data = s->resource_data;
struct resource *res1, *res2; struct resource *res1, *res2;
@ -398,12 +398,12 @@ static int do_validate_mem(struct pcmcia_socket *s,
* function returns the size of the usable memory area. * function returns the size of the usable memory area.
*/ */
static int do_mem_probe(struct pcmcia_socket *s, u_long base, u_long num, static int do_mem_probe(struct pcmcia_socket *s, u_long base, u_long num,
int validate (struct pcmcia_socket *s, int (*validate)(struct pcmcia_socket *s,
struct resource *res, struct resource *res,
unsigned int *value), unsigned int *value),
int fallback (struct pcmcia_socket *s, int (*fallback)(struct pcmcia_socket *s,
struct resource *res, struct resource *res,
unsigned int *value)) unsigned int *value))
{ {
struct socket_data *s_data = s->resource_data; struct socket_data *s_data = s->resource_data;
u_long i, j, bad, fail, step; u_long i, j, bad, fail, step;