Merge tag 'staging-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / drivers / staging / media / bcm2048 / radio-bcm2048.c

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 874d290f962268987bdd39749c6371b7837712b6..d9b02ff662598f0dd5307cea0e7eeb705664755c 100644 (file)
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/staging/media/radio-bcm2048.c
  *
@@ -2574,8 +2575,7 @@ static const struct video_device bcm2048_viddev_template = {
 /*
  *     I2C driver interface
  */
-static int bcm2048_i2c_driver_probe(struct i2c_client *client,
-                                   const struct i2c_device_id *id)
+static int bcm2048_i2c_driver_probe(struct i2c_client *client)
 {
        struct bcm2048_device *bdev;
        int err;
@@ -2679,7 +2679,7 @@ static struct i2c_driver bcm2048_i2c_driver = {
        .driver         = {
                .name   = BCM2048_DRIVER_NAME,
        },
-       .probe          = bcm2048_i2c_driver_probe,
+       .probe_new      = bcm2048_i2c_driver_probe,
        .remove         = bcm2048_i2c_driver_remove,
        .id_table       = bcm2048_id,
 };