mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
memstick: Constify the driver id_table
Just like all other driver structures, the id_table should never be modified by core subsystem parts. Constify this member and actual data structures for increased code safety. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
4a3e92e8cf
commit
5808ef063b
|
|
@ -647,7 +647,7 @@ static int tifm_ms_resume(struct tifm_dev *sock)
|
|||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static struct tifm_device_id tifm_ms_id_tbl[] = {
|
||||
static const struct tifm_device_id tifm_ms_id_tbl[] = {
|
||||
{ TIFM_TYPE_MS }, { 0 }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ static const char *tifm_media_type_name(unsigned char type, unsigned char nt)
|
|||
return card_type_name[nt][type - 1];
|
||||
}
|
||||
|
||||
static int tifm_dev_match(struct tifm_dev *sock, struct tifm_device_id *id)
|
||||
static int tifm_dev_match(struct tifm_dev *sock, const struct tifm_device_id *id)
|
||||
{
|
||||
if (sock->type == id->type)
|
||||
return 1;
|
||||
|
|
@ -43,7 +43,7 @@ static int tifm_bus_match(struct device *dev, const struct device_driver *drv)
|
|||
struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
|
||||
const struct tifm_driver *fm_drv = container_of_const(drv, struct tifm_driver,
|
||||
driver);
|
||||
struct tifm_device_id *ids = fm_drv->id_table;
|
||||
const struct tifm_device_id *ids = fm_drv->id_table;
|
||||
|
||||
if (ids) {
|
||||
while (ids->type) {
|
||||
|
|
|
|||
|
|
@ -1041,7 +1041,7 @@ static int tifm_sd_resume(struct tifm_dev *sock)
|
|||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static struct tifm_device_id tifm_sd_id_tbl[] = {
|
||||
static const struct tifm_device_id tifm_sd_id_tbl[] = {
|
||||
{ TIFM_TYPE_SD }, { }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(tifm, tifm_sd_id_tbl);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ struct tifm_dev {
|
|||
};
|
||||
|
||||
struct tifm_driver {
|
||||
struct tifm_device_id *id_table;
|
||||
const struct tifm_device_id *id_table;
|
||||
int (*probe)(struct tifm_dev *dev);
|
||||
void (*remove)(struct tifm_dev *dev);
|
||||
int (*suspend)(struct tifm_dev *dev,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user