/* * Driver for the PCM512x CODECs * * Author: Mark Brown * Copyright 2014 Linaro Ltd * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. */ #include #include #include #include "pcm512x.h" static int pcm512x_spi_probe(struct spi_device *spi) { struct regmap *regmap; int ret; regmap = devm_regmap_init_spi(spi, &pcm512x_regmap); if (IS_ERR(regmap)) { ret = PTR_ERR(regmap); return ret; } return pcm512x_probe(&spi->dev, regmap); } static int pcm512x_spi_remove(struct spi_device *spi) { pcm512x_remove(&spi->dev); return 0; } static const struct spi_device_id pcm512x_spi_id[] = { { "pcm5121", }, { "pcm5122", }, { "pcm5141", }, { "pcm5142", }, { }, }; MODULE_DEVICE_TABLE(spi, pcm512x_spi_id); static const struct of_device_id pcm512x_of_match[] = { { .compatible = "ti,pcm5121", }, { .compatible = "ti,pcm5122", }, { .compatible = "ti,pcm5141", }, { .compatible = "ti,pcm5142", }, { } }; MODULE_DEVICE_TABLE(of, pcm512x_of_match); static struct spi_driver pcm512x_spi_driver = { .probe = pcm512x_spi_probe, .remove = pcm512x_spi_remove, .id_table = pcm512x_spi_id, .driver = { .name = "pcm512x", .of_match_table = pcm512x_of_match, .pm = &pcm512x_pm_ops, }, }; module_spi_driver(pcm512x_spi_driver); x/net-next.git/log/include/scsi/scsi_transport_fc.h'>logtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /include/scsi/scsi_transport_fc.h
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/scsi/scsi_transport_fc.h')